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

[jftempo]

=== modified file 'bin/addons/account_override/account_invoice_sync.py'
--- bin/addons/account_override/account_invoice_sync.py	2021-01-26 11:14:14 +0000
+++ bin/addons/account_override/account_invoice_sync.py	2021-08-11 08:19:49 +0000
@@ -100,10 +100,43 @@
             line_name = inv_line.get('name', '')
             if not line_name:  # required field
                 raise osv.except_osv(_('Error'), _("Impossible to retrieve the line description."))
+            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,
+                'name': line_name,
+                'quantity': quantity,
+                'price_unit': inv_line.get('price_unit', 0.0),
+                'discount': inv_line.get('discount', 0.0),
+                'uos_id': uom_id,
+            }
+            line_account_id = False
+            fo_line_dict = inv_line.get('sale_order_line_id') or {}
+            if from_supply and inv_linked_po and fo_line_dict.get('sync_local_id'):
+                # fill in the AD at line level if applicable
+                # search the matching between PO line and invoice line
+                po_line_ids = pol_obj.search(cr, uid, [('order_id', '=', inv_linked_po.id), ('sync_linked_sol', '=', inv_line['sale_order_line_id']['sync_local_id'])], context=context)
+                if po_line_ids:
+                    matching_po_line = pol_obj.browse(cr, uid, po_line_ids[0],
+                                                      fields_to_fetch=['analytic_distribution_id', 'cv_line_ids'], context=context)
+                    inv_line_vals.update({'order_line_id': matching_po_line.id})
+                    if matching_po_line.cv_line_ids:
+                        inv_line_vals.update({'cv_line_ids': [(6, 0, [cvl.id for cvl in matching_po_line.cv_line_ids])]})
+                        # cv_line_ids only contains one CV line: get its account
+                        line_account_id = matching_po_line.cv_line_ids[0].account_id.id
+                    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
             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
+            # for the lines linked to a CV: the CV line account is used (handled above)
+            # for the other 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
@@ -113,10 +146,11 @@
                                              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.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:
+            elif not line_account_id:
                 account_code = inv_line.get('account_id', {}).get('code', '')
                 if not account_code:
                     raise osv.except_osv(_('Error'), _("Impossible to retrieve the account code at line level."))
@@ -131,34 +165,9 @@
             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,
-            }
-            fo_line_dict = inv_line.get('sale_order_line_id') or {}
-            if from_supply and inv_linked_po and fo_line_dict.get('sync_local_id'):
-                # fill in the AD at line level if applicable
-                # search the matching between PO line and invoice line
-                po_line_ids = pol_obj.search(cr, uid, [('order_id', '=', inv_linked_po.id), ('sync_linked_sol', '=', inv_line['sale_order_line_id']['sync_local_id'])], context=context)
-                if po_line_ids:
-                    matching_po_line = pol_obj.browse(cr, uid, po_line_ids[0], fields_to_fetch=['analytic_distribution_id'], context=context)
-                    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_vals.update({'account_id': line_account_id,
+                                  'product_id': product_id,
+                                  })
             inv_line_obj.create(cr, uid, inv_line_vals, context=context)
 
     def create_invoice_from_sync(self, cr, uid, source, invoice_data, context=None):
@@ -270,7 +279,9 @@
                 if po_ids:
                     po_id = po_ids[0]
             if po_id:
-                vals.update({'main_purchase_id': po_id})
+                vals.update({'main_purchase_id': po_id,
+                             'purchase_ids': [(6, 0, [po_id])],
+                             })
                 po_fields = ['picking_ids', 'analytic_distribution_id', 'order_line', 'name']
                 po = po_obj.browse(cr, uid, po_id, fields_to_fetch=po_fields, context=context)
                 po_number = po.name
 
=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2021-04-29 16:00:54 +0000
+++ bin/addons/account_override/invoice.py	2021-08-11 08:19:49 +0000
@@ -1423,6 +1423,8 @@
                     vals = by_account_vals[l.account_id.id]
                     if l.order_line_id:
                         vals.setdefault('purchase_order_line_ids', []).append(l.order_line_id.id)
+                    if l.cv_line_ids:
+                        vals.setdefault('cv_line_ids', []).extend([cvl.id for cvl in l.cv_line_ids])
                 else:
                     # new account to merge
                     vals = vals_template.copy()
@@ -1430,9 +1432,12 @@
                         '_index_': index,
                         'account_id': l.account_id.id,
                         'purchase_order_line_ids': [],
+                        'cv_line_ids': [],
                     })
                     if l.order_line_id:
                         vals['purchase_order_line_ids'].append(l.order_line_id.id)
+                    if l.cv_line_ids:
+                        vals['cv_line_ids'].extend([cvl.id for cvl in l.cv_line_ids])
                     index += 1
 
                 '''
@@ -1515,6 +1520,8 @@
 
                 vals['purchase_order_line_ids'] = vals['purchase_order_line_ids'] and [(6, 0, vals['purchase_order_line_ids'])] or False
 
+                vals['cv_line_ids'] = vals['cv_line_ids'] and [(6, 0, vals['cv_line_ids'])] or False
+
                 # create merge line
                 vals.update({'merged_line': True})
                 if not self.pool.get('account.invoice.line').create(cr, uid,
@@ -1797,6 +1804,10 @@
                                                   ('out_refund', 'Customer Refund'),
                                                   ('in_refund', 'Supplier Refund')]),
         'merged_line': fields.boolean(string='Merged Line', help='Line generated by the merging of other lines', readonly=True),
+        # - a CV line can be linked to several invoice lines ==> e.g. several partial deliveries, split of invoice lines
+        # - an invoice line can be linked to several CV lines => e.g. merge invoice lines by account
+        'cv_line_ids': fields.many2many('account.commitment.line', 'inv_line_cv_line_rel', 'inv_line_id', 'cv_line_id',
+                                        string='Commitment Voucher Lines'),
     }
 
     _defaults = {
@@ -1943,7 +1954,7 @@
         """
         Copy an invoice line without its move lines,
         without the link to a reversed invoice line,
-        and without link to PO/FO lines when the duplication is manual
+        and without link to PO/FO/CV lines when the duplication is manual
         Reset the merged_line tag.
         """
         if context is None:
@@ -1955,13 +1966,14 @@
                         'merged_line': False,
                         })
         # Manual duplication should generate a "manual document not created through the supply workflow"
-        # so we don't keep the link to PO/FO at line level
+        # so we don't keep the link to PO/FO/CV at line level
         if context.get('from_button') and not context.get('from_split'):
             default.update({
                 'order_line_id': False,
                 'sale_order_line_id': False,
                 'sale_order_lines': False,
                 'purchase_order_line_ids': [],
+                'cv_line_ids': [(6, 0, [])],
             })
         return super(account_invoice_line, self).copy_data(cr, uid, inv_id, default, context)
 
 
=== modified file 'bin/addons/analytic_distribution/account_commitment.py'
--- bin/addons/analytic_distribution/account_commitment.py	2021-05-11 18:16:37 +0000
+++ bin/addons/analytic_distribution/account_commitment.py	2021-08-11 08:19:49 +0000
@@ -67,6 +67,38 @@
                 res.append(cvl.commit_id.id)
         return res
 
+    def get_cv_type(self, cr, uid, context=None):
+        """
+        Returns the list of possible types for the Commitment Vouchers
+        """
+        return [('manual', 'Manual'),
+                ('external', 'Automatic - External supplier'),
+                ('esc', 'Manual - ESC supplier'),
+                ('intermission', 'Automatic - Intermission'),
+                ('intersection', 'Automatic - Intersection'),
+                ]
+
+    def get_current_cv_version(self, cr, uid, context=None):
+        """
+        Version 2 since US-7449
+        """
+        return 2
+
+    def _display_super_done_button(self, cr, uid, ids, name, arg, context=None):
+        """
+        For now the "Super" Done button, which allows to always set a CV to Done whatever its state and origin,
+        is visible only by the Admin user. It is displayed only when the standard Done button isn't usable.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        for cv in self.read(cr, uid, ids, ['state', 'type'], context=context):
+            other_done_button_usable = cv['state'] == 'open' and cv['type'] not in ('external', 'intermission', 'intersection')
+            res[cv['id']] = not other_done_button_usable and uid == 1 and cv['state'] != 'done'
+        return res
+
     _columns = {
         'journal_id': fields.many2one('account.analytic.journal', string="Journal", readonly=True, required=True),
         'name': fields.char(string="Number", size=64, readonly=True, required=True),
@@ -81,16 +113,22 @@
                                  'account.commitment.line': (_get_cv, ['amount'],10),
                                  }),
         'analytic_distribution_id': fields.many2one('analytic.distribution', string="Analytic distribution"),
-        'type': fields.selection([('manual', 'Manual'), ('external', 'Automatic - External supplier'), ('esc', 'Manual - ESC supplier')], string="Type", readonly=True),
+        'type': fields.selection(get_cv_type, string="Type", readonly=True),
         'notes': fields.text(string="Comment"),
         'purchase_id': fields.many2one('purchase.order', string="Source document", readonly=True),
         'description': fields.char(string="Description", size=256),
+        'version': fields.integer('Version', required=True,
+                                  help="Technical field to distinguish old CVs from new ones which have a different behavior."),
+        'display_super_done_button': fields.function(_display_super_done_button, method=True, type='boolean',
+                                                     store=False, invisible=True,
+                                                     string='Display the button allowing to always set a CV to Done'),
     }
 
     _defaults = {
         'state': lambda *a: 'draft',
         'date': lambda *a: strftime('%Y-%m-%d'),
         'type': lambda *a: 'manual',
+        'version': get_current_cv_version,
         'journal_id': lambda s, cr, uid, c: s.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'engagement'),
                                                                                                     ('instance_id', '=', s.pool.get('res.users').browse(cr, uid, uid, c).company_id.instance_id.id)], limit=1, context=c)[0]
     }
@@ -181,29 +219,30 @@
                     fctal_currency = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id'], context=context).company_id.currency_id.id
                     for cl in c.line_ids:
                         # Verify that date is compatible with all analytic account from distribution
+                        distrib = False
                         if cl.analytic_distribution_id:
                             distrib = cl.analytic_distribution_id
                         elif cl.commit_id and cl.commit_id.analytic_distribution_id:
                             distrib = cl.commit_id.analytic_distribution_id
-                        else:
-                            raise osv.except_osv(_('Warning'), _('No analytic distribution found for %s %s') % (cl.account_id.code, cl.initial_amount))
-                        for distrib_lines in [distrib.cost_center_lines, distrib.funding_pool_lines, distrib.free_1_lines, distrib.free_2_lines]:
-                            for distrib_line in distrib_lines:
-                                if distrib_line.analytic_id and \
-                                    (distrib_line.analytic_id.date_start and date < distrib_line.analytic_id.date_start or
-                                     distrib_line.analytic_id.date and date >= distrib_line.analytic_id.date):
-                                    raise osv.except_osv(_('Error'), _('The analytic account %s is not active for given date.') %
-                                                         (distrib_line.analytic_id.name,))
-                        dest_cc_tuples = set()  # check each Dest/CC combination only once
-                        for distrib_cc_l in distrib.cost_center_lines:
-                            if distrib_cc_l.analytic_id:  # non mandatory field
-                                dest_cc_tuples.add((distrib_cc_l.destination_id, distrib_cc_l.analytic_id))
-                        for distrib_fp_l in distrib.funding_pool_lines:
-                            dest_cc_tuples.add((distrib_fp_l.destination_id, distrib_fp_l.cost_center_id))
-                        for dest, cc in dest_cc_tuples:
-                            if dest_cc_link_obj.is_inactive_dcl(cr, uid, dest.id, cc.id, date, context=context):
-                                raise osv.except_osv(_('Error'), _("The combination \"%s - %s\" is not active at this date: %s") %
-                                                     (dest.code or '', cc.code or '', date))
+                        if distrib:
+                            for distrib_lines in [distrib.cost_center_lines, distrib.funding_pool_lines,
+                                                  distrib.free_1_lines, distrib.free_2_lines]:
+                                for distrib_line in distrib_lines:
+                                    if distrib_line.analytic_id and \
+                                        (distrib_line.analytic_id.date_start and date < distrib_line.analytic_id.date_start or
+                                         distrib_line.analytic_id.date and date >= distrib_line.analytic_id.date):
+                                        raise osv.except_osv(_('Error'), _('The analytic account %s is not active for given date.') %
+                                                             (distrib_line.analytic_id.name,))
+                            dest_cc_tuples = set()  # check each Dest/CC combination only once
+                            for distrib_cc_l in distrib.cost_center_lines:
+                                if distrib_cc_l.analytic_id:  # non mandatory field
+                                    dest_cc_tuples.add((distrib_cc_l.destination_id, distrib_cc_l.analytic_id))
+                            for distrib_fp_l in distrib.funding_pool_lines:
+                                dest_cc_tuples.add((distrib_fp_l.destination_id, distrib_fp_l.cost_center_id))
+                            for dest, cc in dest_cc_tuples:
+                                if dest_cc_link_obj.is_inactive_dcl(cr, uid, dest.id, cc.id, date, context=context):
+                                    raise osv.except_osv(_('Error'), _("The combination \"%s - %s\" is not active at this date: %s") %
+                                                         (dest.code or '', cc.code or '', date))
                         # update the dates and fctal amounts of the related analytic lines
                         context.update({'currency_date': date})  # same date used for doc, posting and source date of all lines
                         for aal in cl.analytic_lines:
@@ -233,6 +272,7 @@
         default.update({
             'name': self.pool.get('ir.sequence').get(cr, uid, 'account.commitment'),
             'state': 'draft',
+            'version': self.get_current_cv_version(cr, uid, context=context),
         })
         # Default method
         res = super(account_commitment, self).copy(cr, uid, c_id, default, context)
@@ -312,6 +352,12 @@
             'context': context,
         }
 
+    def button_analytic_distribution_2(self, cr, uid, ids, context=None):
+        """
+        This is just an alias for button_analytic_distribution (used to have different names and attrs on both buttons)
+        """
+        return self.button_analytic_distribution(cr, uid, ids, context=context)
+
     def button_reset_distribution(self, cr, uid, ids, context=None):
         """
         Reset analytic distribution on all commitment lines.
@@ -444,10 +490,11 @@
             # Search analytic lines that have commitment line ids
             search_ids = self.pool.get('account.analytic.line').search(cr, uid, [('commitment_line_id', 'in', [x.id for x in c.line_ids])], context=context)
             # Delete them
-            res = self.pool.get('account.analytic.line').unlink(cr, uid, search_ids, context=context)
+            if search_ids:
+                res = self.pool.get('account.analytic.line').unlink(cr, uid, search_ids, context=context)
+                if not res:
+                    raise osv.except_osv(_('Error'), _('An error occurred on engagement lines deletion.'))
             # And finally update commitment voucher state and lines amount
-            if not res:
-                raise osv.except_osv(_('Error'), _('An error occurred on engagement lines deletion.'))
             self.pool.get('account.commitment.line').write(cr, uid, [x.id for x in c.line_ids], {'amount': 0}, context=context)
             self.write(cr, uid, [c.id], {'state':'done'}, context=context)
         return True
@@ -457,7 +504,7 @@
 class account_commitment_line(osv.osv):
     _name = 'account.commitment.line'
     _description = "Account Commitment Voucher Line"
-    _order = "id desc"
+    _order = "po_line_id, id desc"
     _rec_name = 'account_id'
     _trace = True
 
@@ -497,6 +544,12 @@
                 res[co.id] = False
         return res
 
+    def get_cv_type(self, cr, uid, context=None):
+        """
+        Gets the possible CV types
+        """
+        return self.pool.get('account.commitment').get_cv_type(cr, uid, context)
+
     _columns = {
         'account_id': fields.many2one('account.account', string="Account", required=True),
         'amount': fields.float(string="Amount left", digits_compute=dp.get_precision('Account'), required=False),
@@ -504,6 +557,8 @@
         'commit_id': fields.many2one('account.commitment', string="Commitment Voucher", on_delete="cascade"),
         'commit_number': fields.related('commit_id', 'name', type='char', size=64,
                                         readonly=True, store=False, string="Commitment Voucher Number"),
+        'commit_type': fields.related('commit_id', 'type', string="Commitment Voucher Type", type='selection', readonly=True,
+                                      store=False, invisible=True, selection=get_cv_type, write_relate=False),
         'analytic_distribution_id': fields.many2one('analytic.distribution', string="Analytic distribution"),
         'analytic_distribution_state': fields.function(_get_distribution_state, method=True, type='selection',
                                                        selection=[('none', 'None'), ('valid', 'Valid'), ('invalid', 'Invalid')],
@@ -513,8 +568,15 @@
         'analytic_lines': fields.one2many('account.analytic.line', 'commitment_line_id', string="Analytic Lines"),
         'first': fields.boolean(string="Is not created?", help="Useful for onchange method for views. Should be False after line creation.",
                                 readonly=True),
+        # for CV in version 1
         'purchase_order_line_ids': fields.many2many('purchase.order.line', 'purchase_line_commitment_rel', 'commitment_id', 'purchase_id',
-                                                    string="Purchase Order Lines", readonly=True),
+                                                    string="Purchase Order Lines (deprecated)", readonly=True),
+        # for CV starting from version 2
+        'po_line_id': fields.many2one('purchase.order.line', "PO Line"),
+        'po_line_product_id': fields.related('po_line_id', 'product_id', type='many2one', relation='product.product',
+                                             string="Product", readonly=True, store=True, write_relate=False),
+        'po_line_number': fields.related('po_line_id', 'line_number', type='integer_null', string="PO Line", readonly=True,
+                                         store=True, write_relate=False, _fnct_migrate=lambda *a: True),
     }
 
     _defaults = {
@@ -656,6 +718,19 @@
                         self.update_analytic_lines(cr, uid, [line.id], vals.get('amount'), account_id, context=context)
         return super(account_commitment_line, self).write(cr, uid, ids, vals, context={})
 
+    def copy_data(self, cr, uid, cv_line_id, default=None, context=None):
+        """
+        Duplicates a CV line: resets the link to PO line
+        """
+        if context is None:
+            context = {}
+        if default is None:
+            default = {}
+        default.update({
+            'po_line_id': False,
+        })
+        return super(account_commitment_line, self).copy_data(cr, uid, cv_line_id, default, context)
+
     def button_analytic_distribution(self, cr, uid, ids, context=None):
         """
         Launch analytic distribution wizard on a commitment voucher line
 
=== modified file 'bin/addons/analytic_distribution/account_commitment_view.xml'
--- bin/addons/analytic_distribution/account_commitment_view.xml	2020-09-23 09:29:11 +0000
+++ bin/addons/analytic_distribution/account_commitment_view.xml	2021-08-11 08:19:49 +0000
@@ -28,20 +28,36 @@
                             <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
                         </group>
                         <group colspan="8" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
-                            <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
+                            <button name="button_analytic_distribution_2" string="Analytical Distribution"
+                                    type="object" icon="terp-emblem-important" context="context" colspan="4"
+                                    attrs="{'readonly': [('state', '=', 'open'), ('type', '=', 'manual')]}"/>
                             <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft"/>
                     </group>
                     <field name="analytic_distribution_id" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Commitment voucher lines">
-                            <field name="line_ids" nolabel="1" colspan="4" attrs="{'readonly': ['|', ('state', '=', 'done'), ('type', '=', 'external')]}"/>
+                            <field name="line_ids" nolabel="1" colspan="4"
+                                   attrs="{'readonly': ['|', ('state', '=', 'done'),
+                                                        '&amp;',
+                                                        ('type', 'in', ['external', 'intermission', 'intersection']),
+                                                        ('state', '!=', 'draft')]}"
+                            />
                         </page>
                     </notebook>
                     <field name="notes" colspan="4"/>
                     <group col="6" colspan="4">
                         <button name="button_compute" string="Compute total" icon="gtk-execute" colspan="2"/>
                         <button name="commitment_open" string="Validate" icon="terp-camera_test" states="draft" colspan="2"/>
-                        <button name="commitment_validate" string="Done" icon="terp-gtk-go-back-rtl" states="open" colspan="2" attrs="{'readonly': [('type', '=', 'external')]}"/>
+                        <field name="display_super_done_button"/>
+                        <button name="commitment_validate" string="Done" icon="terp-gtk-go-back-rtl" colspan="2"
+                                attrs="{'invisible': ['|', ('state', '!=', 'open'), ('display_super_done_button', '=', True)],
+                                        'readonly': [('type', 'in', ['external', 'intermission', 'intersection'])]}"
+                        />
+                        <!-- button which allows to always set a CV to Done (whatever its state and origin) -->
+                        <button name="commitment_always_validate" string="Done (for Administrator only)"
+                                icon="terp-gtk-go-back-rtl" colspan="6"
+                                confirm='You are about to set this Commitment Voucher to the state "Done". Do you want to proceed?'
+                                attrs="{'invisible': [('display_super_done_button', '=', False)]}"/>
                     </group>
                     <field name="state"/>
                     <field name="total"/>
@@ -73,14 +89,32 @@
             <field name="model">account.commitment.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Commitment Voucher Lines" editable="top" colors="red:analytic_distribution_state == 'invalid'">
+                <!-- display the "New" button or not depending on the state and type of the CV itself -->
+                <tree string="Commitment Voucher Lines" editable="top" colors="red:analytic_distribution_state == 'invalid'"
+                      button_attrs="{'invisible': ['|', ('state', '=', 'done'), ('type', 'in', ['external', 'intermission', 'intersection'])]}"
+                      hide_delete_button="1"
+                      >
+                    <field name="commit_type"/>
+                    <field name="po_line_product_id"/>
+                    <field name="po_line_number"/>
                     <field name="account_id" domain="[('restricted_area', '=', 'commitment_lines')]"/>
-                    <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-stock_symbol-selection" context="context"/>
-                    <field name="analytic_distribution_state"/>
-                    <field name="have_analytic_distribution_from_header"/>
+                    <button name="button_analytic_distribution" string="Analytical Distribution" type="object"
+                            icon="terp-stock_symbol-selection" context="context"
+                    />
+                    <field name="analytic_distribution_state" readonly="1"/>
+                    <field name="have_analytic_distribution_from_header" readonly="1"/>
                     <field name="first" invisible="1"/>
-                    <field name="initial_amount" on_change="onchange_initial_amount(first, initial_amount)"/>
-                    <field name="amount" attrs="{'readonly': [('first', '=', True)]}"/>
+                    <field name="initial_amount" on_change="onchange_initial_amount(first, initial_amount)"
+                           attrs="{'readonly': [('commit_type', 'in', ['external', 'intermission', 'intersection'])]}"
+                    />
+                    <field name="amount"
+                           attrs="{'readonly': ['|', ('first', '=', True), ('commit_type', 'in', ['external', 'intermission', 'intersection'])]}"
+                    />
+                    <!-- display the "Delete" button or not depending on the state and type of the CV itself -->
+                    <button name="unlink" string="Delete" icon="gtk-del" type="object"
+                            attrs="{'invisible': ['|', ('state', '=', 'done'), ('type', 'in', ['external', 'intermission', 'intersection'])]}"
+                            confirm="Do you really want to delete this line?"
+                    />
                 </tree>
             </field>
         </record>
@@ -95,6 +129,8 @@
                     <group col='6' colspan='4'>
                         <filter icon="terp-tools" string="Manual" domain="[('type','=','manual')]" help="Manual Commitment Voucher"/>
                         <filter icon="gtk-quit" string="External" domain="[('type','=','external')]" help="External Commitment Voucher"/>
+                        <filter icon="gtk-refresh" string="Intersection" domain="[('type', '=', 'intersection')]" help="Intersection Commitment Voucher"/>
+                        <filter icon="gtk-ok" string="Intermission" domain="[('type', '=', 'intermission')]" help="Intermission Commitment Voucher"/>
                         <filter icon="terp-partner" string="ESC" domain="[('type','=','esc')]" help="ESC Commitment Voucher"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Commitment Voucher in Draft state" name="draft"/>
 
=== modified file 'bin/addons/analytic_distribution/account_commitment_workflow.xml'
--- bin/addons/analytic_distribution/account_commitment_workflow.xml	2011-11-30 14:56:38 +0000
+++ bin/addons/analytic_distribution/account_commitment_workflow.xml	2021-08-11 08:19:49 +0000
@@ -34,14 +34,30 @@
         <record id="commit_t1" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
+            <field name="sequence">10</field>
             <field name="signal">commitment_open</field>
         </record>
 
         <record id="commit_t2" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_done"/>
+            <field name="sequence">10</field>
             <field name="signal">commitment_validate</field>
         </record>
 
+        <record id="commit_t3" model="workflow.transition">
+            <field name="act_from" ref="act_open"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="sequence">15</field>  <!-- (sequence, act_from) must be unique -->
+            <field name="signal">commitment_always_validate</field>
+        </record>
+
+        <record id="commit_t4" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="sequence">15</field>  <!-- (sequence, act_from) must be unique -->
+            <field name="signal">commitment_always_validate</field>
+        </record>
+
     </data>
 </openerp>
 
=== modified file 'bin/addons/analytic_distribution_supply/invoice.py'
--- bin/addons/analytic_distribution_supply/invoice.py	2021-01-26 13:48:04 +0000
+++ bin/addons/analytic_distribution_supply/invoice.py	2021-08-11 08:19:49 +0000
@@ -26,6 +26,7 @@
 from osv import fields
 from tools.translate import _
 from base import currency_date
+import netsvc
 
 
 class account_invoice_line(osv.osv):
@@ -93,20 +94,27 @@
                         self.pool.get('account.invoice').write(cr, uid, [inv.id], {'analytic_distribution_id': new_distrib_id,})
             # Then set distribution on invoice line regarding purchase order line distribution
             for invl in inv.invoice_line:
-                if invl.order_line_id:
+                line_distrib_id = False
+                if invl.cv_line_ids:
+                    # CV STARTING FROM VERSION 2
+                    # the first CV line found is used since there can be only one at this step (merging lines by account could
+                    # generate an invoice line linked to several CV lines but this action can only be done later in the process)
+                    line_distrib_id = invl.cv_line_ids[0].analytic_distribution_id and invl.cv_line_ids[0].analytic_distribution_id.id or False
+                elif invl.order_line_id:
                     # Fetch PO line analytic distribution or nothing (that implies it take those from PO)
-                    distrib_id = invl.order_line_id.analytic_distribution_id and invl.order_line_id.analytic_distribution_id.id or False
+                    line_distrib_id = invl.order_line_id.analytic_distribution_id and invl.order_line_id.analytic_distribution_id.id or False
                     # Attempt to fetch commitment line analytic distribution or commitment voucher analytic distribution or default distrib_id
+                    # CV IN VERSION 1
                     if invl.order_line_id.commitment_line_ids:
-                        distrib_id = invl.order_line_id.commitment_line_ids[0].analytic_distribution_id \
-                            and invl.order_line_id.commitment_line_ids[0].analytic_distribution_id.id or distrib_id
-                    if distrib_id:
-                        new_invl_distrib_id = ana_obj.copy(cr, uid, distrib_id, {})
-                        if not new_invl_distrib_id:
-                            raise osv.except_osv(_('Error'), _('An error occurred for analytic distribution copy for invoice.'))
-                        # create default funding pool lines
-                        ana_obj.create_funding_pool_lines(cr, uid, [new_invl_distrib_id], invl.account_id.id)
-                        invl_obj.write(cr, uid, [invl.id], {'analytic_distribution_id': new_invl_distrib_id})
+                        line_distrib_id = invl.order_line_id.commitment_line_ids[0].analytic_distribution_id \
+                            and invl.order_line_id.commitment_line_ids[0].analytic_distribution_id.id or line_distrib_id
+                if line_distrib_id:
+                    new_invl_distrib_id = ana_obj.copy(cr, uid, line_distrib_id, {})
+                    if not new_invl_distrib_id:
+                        raise osv.except_osv(_('Error'), _('An error occurred for analytic distribution copy for invoice.'))
+                    # create default funding pool lines
+                    ana_obj.create_funding_pool_lines(cr, uid, [new_invl_distrib_id], invl.account_id.id)
+                    invl_obj.write(cr, uid, [invl.id], {'analytic_distribution_id': new_invl_distrib_id})
                 # Fetch SO line analytic distribution
                     # sol AD copy moved into _invoice_line_hook
         return True
@@ -124,7 +132,8 @@
 
         # Browse invoices
         for inv in self.browse(cr, uid, ids, context=context):
-            grouped_invl = {}
+            grouped_invl_by_acc = {}
+            grouped_invl_by_cvl = {}
             co_ids = self.pool.get('account.commitment').search(cr, uid, [('purchase_id', 'in', [x.id for x in inv.purchase_ids]), ('state', 'in', ['open', 'draft'])], order='date desc', context=context)
             if not co_ids:
                 continue
@@ -133,27 +142,50 @@
                 # Do not take invoice line that have no order_line_id (so that are not linked to a purchase order line)
                 if not invl.order_line_id and not inv.is_merged_by_account:
                     continue
-
-                # Fetch purchase order line account
-                if inv.is_merged_by_account:
-                    if not invl.account_id:
-                        continue
-                    # US-357: lines without product (get directly account)
-                    a = invl.account_id.id
-                else:
-                    pol = invl.order_line_id
-                    a = self._get_expense_account(cr, uid, pol, context=context)
-                    if pol.product_id and not a:
-                        raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (pol.product_id.name, pol.product_id.id))
-                    elif not a:
-                        raise osv.except_osv(_('Error !'), _('There is no expense account defined for this PO line: "%s" (id:%d)') % (pol.line_number, pol.id))
-                if a not in grouped_invl:
-                    grouped_invl[a] = 0
-
-                grouped_invl[a] += invl.price_subtotal
+                # exclude push flow
+                if invl.order_line_id and (invl.order_line_id.order_id.push_fo or invl.order_line_id.set_as_sourced_n):
+                    continue
+                old_cv_version = True
+                # CV STARTING FROM VERSION 2
+                amount_to_subtract = invl.price_subtotal or 0.0
+                for cv_line in invl.cv_line_ids:
+                    old_cv_version = False  # the field cv_line_ids exist for CVs starting from version 2
+                    if abs(amount_to_subtract) <= 10**-3:
+                        break
+                    cvl_amount_left = cv_line.amount or 0.0
+                    if cvl_amount_left:
+                        if cv_line.id not in grouped_invl_by_cvl:
+                            grouped_invl_by_cvl[cv_line.id] = 0
+                        if amount_to_subtract >= cvl_amount_left:
+                            grouped_invl_by_cvl[cv_line.id] += cvl_amount_left
+                            amount_to_subtract -= cvl_amount_left
+                        else:
+                            grouped_invl_by_cvl[cv_line.id] += amount_to_subtract
+                            amount_to_subtract = 0
+                # CV IN VERSION 1
+                if old_cv_version:
+                    # Fetch purchase order line account
+                    if inv.is_merged_by_account:
+                        if not invl.account_id:
+                            continue
+                        # US-357: lines without product (get directly account)
+                        a = invl.account_id.id
+                    else:
+                        pol = invl.order_line_id
+                        a = self._get_expense_account(cr, uid, pol, context=context)
+                        if pol.product_id and not a:
+                            raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') %
+                                                 (pol.product_id.name, pol.product_id.id))
+                        elif not a:
+                            raise osv.except_osv(_('Error !'), _('There is no expense account defined for this PO line: "%s" (id:%d)') %
+                                                 (pol.line_number, pol.id))
+                    if a not in grouped_invl_by_acc:
+                        grouped_invl_by_acc[a] = 0
+                    grouped_invl_by_acc[a] += invl.price_subtotal
 
             po_ids = [x.id for x in inv.purchase_ids]
-            self._update_commitments_lines(cr, uid, po_ids, grouped_invl, from_cancel=False, context=context)
+            self._update_commitments_lines(cr, uid, po_ids, account_amount_dic=grouped_invl_by_acc,
+                                           cvl_amount_dic=grouped_invl_by_cvl, from_cancel=False, context=context)
 
         return True
 
@@ -170,38 +202,51 @@
 
         return account_id
 
-    def _update_commitments_lines(self, cr, uid, po_ids, account_amount_dic, from_cancel=False, context=None):
+    def _update_commitments_lines(self, cr, uid, po_ids, account_amount_dic=None, cvl_amount_dic=None, from_cancel=False, context=None):
         """
             po_ids: list of PO ids
             account_amount_dic: dict, keys are G/L account_id, values are amount to deduce
 
 
         """
-        if not po_ids or not account_amount_dic:
+        if not po_ids or not account_amount_dic and not cvl_amount_dic:
             return True
 
         if context is None:
             context = {}
+        if account_amount_dic is None:
+            account_amount_dic = {}
+        if cvl_amount_dic is None:
+            cvl_amount_dic = {}
+        wf_service = netsvc.LocalService("workflow")
 
         # po is state=cancel on last IN cancel
         company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
-        cr.execute('''select l.id, l.account_id, l.commit_id, c.state, l.amount, l.analytic_distribution_id, c.analytic_distribution_id, c.id, c.currency_id, c.type from
+        # avoids empty lists so that the SQL request can be executed
+        account_list = account_amount_dic.keys() or [0]
+        cvl_list = cvl_amount_dic.keys() or [0]
+        cr.execute('''select l.id, l.account_id, l.commit_id, c.state, l.amount, l.analytic_distribution_id, c.analytic_distribution_id, 
+            c.id, c.currency_id, c.type, c.version from
             account_commitment_line l, account_commitment c
             where l.commit_id = c.id and
             l.amount > 0 and
             c.purchase_id in %s and
-            l.account_id in %s and
+            (c.version < 2 and l.account_id in %s or c.version >= 2 and l.id in %s) and
             c.state in ('open', 'draft')
             order by c.date asc
-            ''', (tuple(po_ids), tuple(account_amount_dic.keys()))
+            ''', (tuple(po_ids), tuple(account_list), tuple(cvl_list))
         )
         # sort all cv lines by account / cv date
-        cv_info = {}
+        account_info = {}
+        cvl_info = {}
         auto_cv = True
         for cv in cr.fetchall():
-            if cv[1] not in cv_info:
-                cv_info[cv[1]] = []
-            cv_info[cv[1]].append(cv)
+            if cv[10] < 2:
+                # CV IN VERSION 1
+                account_info.setdefault(cv[1], []).append(cv)  # key = account id
+            else:
+                # CV STARTING FROM VERSION 2
+                cvl_info.setdefault(cv[0], []).append(cv)  # key = CV line id
             if cv[9] == 'manual':
                 auto_cv = False
 
@@ -210,76 +255,74 @@
         cv_to_close = {}
 
         # deduce amount on oldest cv lines
-        for account in account_amount_dic.keys():
-            if account not in cv_info:
-                continue
-            for cv_line in cv_info[account]:
-                if cv_line[3] == 'draft' and cv_line[2] not in draft_opened and not from_cancel:
-                    draft_opened.append(cv_line[2])
-                    # If Commitment voucher in draft state we change it to 'validated' without using workflow and engagement lines generation
-                    # NB: This permits to avoid modification on commitment voucher when receiving some goods
-                    self.pool.get('account.commitment').write(cr, uid, [cv_line[2]], {'state': 'open'}, context=context)
-
-                if cv_line[4] - account_amount_dic[account] > 0.001:
-                    # update amount left on CV line
-                    amount_left = cv_line[4] - account_amount_dic[account]
-                    self.pool.get('account.commitment.line').write(cr, uid, [cv_line[0]], {'amount': amount_left}, context=context)
-
-                    # update AAL
-                    distrib_id = cv_line[5] or cv_line[6]
-                    if not distrib_id:
-                        raise osv.except_osv(_('Error'), _('No analytic distribution found.'))
-
-                    # Browse distribution
-                    distrib = self.pool.get('analytic.distribution').browse(cr, uid, [distrib_id], context=context)[0]
-                    engagement_lines = distrib.analytic_lines
-                    for distrib_lines in [distrib.cost_center_lines, distrib.funding_pool_lines, distrib.free_1_lines, distrib.free_2_lines]:
-                        for distrib_line in distrib_lines:
-                            vals = {
-                                'account_id': distrib_line.analytic_id.id,
-                                'general_account_id': account,
-                            }
-                            if distrib_line._name == 'funding.pool.distribution.line':
-                                vals.update({'cost_center_id': distrib_line.cost_center_id and distrib_line.cost_center_id.id or False,})
+        # NOTE: account_amount_dic is for CV in version 1 based on accounts (acc),
+        #       cvl_amount_dic is for CV from version 2 based on CV lines (cvl)
+        for c_type in ("acc", "cvl"):
+            if c_type == "acc":
+                cv_info = account_info.copy()
+                amount_dic = account_amount_dic.copy()
+            else:
+                cv_info = cvl_info.copy()
+                amount_dic = cvl_amount_dic.copy()
+            for k in amount_dic.keys():  # account id or CV line id
+                if k not in cv_info:
+                    continue
+                for cv_line in cv_info[k]:
+                    if cv_line[3] == 'draft' and cv_line[2] not in draft_opened and not from_cancel:
+                        draft_opened.append(cv_line[2])
+                        # Change Draft CV to Validated State, in order to avoid CV modification when receiving some goods.
+                        # The workflow is used so that all the engagement lines are generated, even those which are not
+                        # affected by the current update (e.g. partial reception + SI validation on one in 2 products).
+                        wf_service.trg_validate(uid, 'account.commitment', cv_line[2], 'commitment_open', cr)
+
+                    if cv_line[4] - amount_dic[k] > 0.001:
+                        # update amount left on CV line
+                        amount_left = cv_line[4] - amount_dic[k]
+                        self.pool.get('account.commitment.line').write(cr, uid, [cv_line[0]], {'amount': amount_left}, context=context)
+                        # update AAL
+                        distrib_id = cv_line[5] or cv_line[6]
+                        if not distrib_id:
+                            raise osv.except_osv(_('Error'), _('No analytic distribution found.'))
+                        # Browse distribution
+                        distrib = self.pool.get('analytic.distribution').browse(cr, uid, [distrib_id], context=context)[0]
+                        engagement_lines = distrib.analytic_lines
+                        for distrib_line in distrib.funding_pool_lines:
                             # Browse engagement lines to found out matching elements
-                            for i in range(0,len(engagement_lines)):
+                            for i in range(0, len(engagement_lines)):
                                 if engagement_lines[i]:
                                     eng_line = engagement_lines[i]
-                                    cmp_vals = {
-                                        'account_id': eng_line.account_id.id,
-                                        'general_account_id': eng_line.general_account_id.id,
-                                    }
-                                    if eng_line.cost_center_id:
-                                        cmp_vals.update({'cost_center_id': eng_line.cost_center_id.id})
-                                    if cmp_vals == vals:
-                                        # Update analytic line with new amount
-                                        anal_amount = (distrib_line.percentage * amount_left) / 100
-                                        curr_date = currency_date.get_date(self, cr, eng_line.document_date, eng_line.date,
-                                                                           source_date=eng_line.source_date)
-                                        context.update({'currency_date': curr_date})
-                                        amount = -1 * self.pool.get('res.currency').compute(cr, uid, cv_line[8], company_currency,
-                                                                                            anal_amount, round=False, context=context)
-
-                                        # write new amount to corresponding engagement line
-                                        self.pool.get('account.analytic.line').write(cr, uid, [eng_line.id],
-                                                                                     {'amount': amount, 'amount_currency': -1 * anal_amount}, context=context)
-
-                    # check next G/L account
-                    break
-
-                cv_to_close[cv_line[2]] = True
-                eng_ids = self.pool.get('account.analytic.line').search(cr, uid, [('commitment_line_id', '=', cv_line[0])], context=context)
-                if eng_ids:
-                    self.pool.get('account.analytic.line').unlink(cr, uid, eng_ids, context=context)
-                self.pool.get('account.commitment.line').write(cr, uid, [cv_line[0]], {'amount': 0.0}, context=context)
-                if abs(cv_line[4] - account_amount_dic[account]) < 0.001:
-                    # check next G/L account
-                    break
-
-                # check next CV on this account
-                account_amount_dic[account] -= cv_line[4]
-
-        if auto_cv and from_cancel:
+                                    # restrict to the current CV line only
+                                    if eng_line.commitment_line_id and eng_line.commitment_line_id.id == cv_line[0]:
+                                        eng_line_distrib_id = eng_line.distrib_line_id and \
+                                            eng_line.distrib_line_id._name == 'funding.pool.distribution.line' and \
+                                            eng_line.distrib_line_id.id or False
+                                        # in case of an AD with several lines, several AJIs are linked to the same CV line:
+                                        # the comparison is used to decrement the right one
+                                        if eng_line_distrib_id == distrib_line.id:
+                                            # Update analytic line with new amount
+                                            anal_amount = (distrib_line.percentage * amount_left) / 100
+                                            curr_date = currency_date.get_date(self, cr, eng_line.document_date, eng_line.date,
+                                                                               source_date=eng_line.source_date)
+                                            context.update({'currency_date': curr_date})
+                                            amount = -1 * self.pool.get('res.currency').compute(cr, uid, cv_line[8], company_currency,
+                                                                                                anal_amount, round=False, context=context)
+                                            # write new amount to corresponding engagement line
+                                            self.pool.get('account.analytic.line').write(cr, uid, [eng_line.id],
+                                                                                         {'amount': amount,
+                                                                                          'amount_currency': -1 * anal_amount}, context=context)
+                        # check next G/L account or CV line
+                        break
+                    cv_to_close[cv_line[2]] = True
+                    eng_ids = self.pool.get('account.analytic.line').search(cr, uid, [('commitment_line_id', '=', cv_line[0])], context=context)
+                    if eng_ids:
+                        self.pool.get('account.analytic.line').unlink(cr, uid, eng_ids, context=context)
+                    self.pool.get('account.commitment.line').write(cr, uid, [cv_line[0]], {'amount': 0.0}, context=context)
+                    if abs(cv_line[4] - amount_dic[k]) < 0.001:
+                        # check next G/L account or CV line
+                        break
+                    amount_dic[k] -= cv_line[4]
+
+        if auto_cv and from_cancel and from_cancel is not True:
             # we cancel the last IN from PO and no draft invoice exist
             if not self.pool.get('account.invoice').search_exist(cr, uid, [('purchase_ids', 'in', po_ids), ('state', '=', 'draft')], context=context):
                 dpo_ids = self.pool.get('purchase.order').search(cr, uid, [('id', 'in', po_ids), ('po_version', '!=', 1), ('order_type', '=', 'direct')], context=context)
 
=== modified file 'bin/addons/analytic_distribution_supply/stock.py'
--- bin/addons/analytic_distribution_supply/stock.py	2018-09-04 17:49:19 +0000
+++ bin/addons/analytic_distribution_supply/stock.py	2021-08-11 08:19:49 +0000
@@ -23,30 +23,6 @@
 
 from osv import osv
 
-class stock_picking(osv.osv):
-    _name = 'stock.picking'
-    _inherit = 'stock.picking'
-
-
-    def _invoice_hook(self, cr, uid, picking, invoice_id):
-        """
-        Create a link between invoice and purchase_order.
-        Copy analytic distribution from purchase order to invoice (or from commitment voucher if exists)
-        """
-        if invoice_id and picking:
-            po_id = picking.purchase_id and picking.purchase_id.id or False
-            so_id = picking.sale_id and picking.sale_id.id or False
-            if po_id:
-                self.pool.get('purchase.order').write(cr, uid, [po_id], {'invoice_ids': [(4, invoice_id)]})
-            if so_id:
-                self.pool.get('sale.order').write(cr, uid, [so_id], {'invoice_ids': [(4, invoice_id)]})
-            # Copy analytic distribution from purchase order or commitment voucher (if exists) or sale order
-            self.pool.get('account.invoice').fetch_analytic_distribution(cr, uid, [invoice_id])
-        return super(stock_picking, self)._invoice_hook(cr, uid, picking, invoice_id)
-
-# action_invoice_create method have been removed because of impossibility to retrieve DESTINATION from SO.
-
-stock_picking()
 
 class stock_move(osv.osv):
     _name = 'stock.move'
@@ -64,6 +40,7 @@
 
         inv_obj = self.pool.get('account.invoice')
         account_amount = {}
+        cvl_amount = {}
         po_ids = {}
         for move in self.browse(cr, uid, ids, context=context):
             # Fetch all necessary elements
@@ -80,14 +57,21 @@
                 continue
 
             po_ids[move.purchase_line_id.order_id.id] = True
-            account_id = inv_obj._get_expense_account(cr, uid, move.purchase_line_id, context=context)
-            if account_id:
-                if account_id not in account_amount:
-                    account_amount[account_id] = 0
-                account_amount[account_id] += round(qty * price_unit, 2)
-
-        if account_amount and po_ids:
-            inv_obj._update_commitments_lines(cr, uid, po_ids.keys(), account_amount, from_cancel=ids, context=context)
+            cv_line = move.purchase_line_id.cv_line_ids and move.purchase_line_id.cv_line_ids[0] or False
+            cv_version = cv_line and cv_line.commit_id and cv_line.commit_id.version or 1
+            if cv_version > 1:
+                if cv_line.id not in cvl_amount:
+                    cvl_amount[cv_line.id] = 0
+                cvl_amount[cv_line.id] += round(qty * price_unit, 2)
+            else:
+                account_id = inv_obj._get_expense_account(cr, uid, move.purchase_line_id, context=context)
+                if account_id:
+                    if account_id not in account_amount:
+                        account_amount[account_id] = 0
+                    account_amount[account_id] += round(qty * price_unit, 2)
+        if (account_amount or cvl_amount) and po_ids:
+            inv_obj._update_commitments_lines(cr, uid, po_ids.keys(), account_amount_dic=account_amount, cvl_amount_dic=cvl_amount,
+                                              from_cancel=ids, context=context)
 
         return super(stock_move, self).action_cancel(cr, uid, ids, context=context)
 
 
=== modified file 'bin/addons/base/res/res_log.py'
--- bin/addons/base/res/res_log.py	2018-08-06 13:07:33 +0000
+++ bin/addons/base/res/res_log.py	2021-08-11 08:19:49 +0000
@@ -55,6 +55,8 @@
         create_context = context and dict(context) or {}
         if 'res_log_read' in create_context:
             vals['read'] = create_context.pop('res_log_read')
+        if '__copy_data_seen' in create_context:
+            create_context.pop('__copy_data_seen')
         if create_context and not vals.get('context'):
             vals['context'] = create_context
         return super(res_log, self).create(cr, uid, vals, context=context)
 
=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2021-08-05 13:10:04 +0000
+++ bin/addons/msf_profile/data/patches.xml	2021-08-11 08:19:49 +0000
@@ -677,6 +677,7 @@
             <field name="method">us_8753_admin_never_expire_password</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF22.0 -->
         <record id="us_8805_product_set_archived" model="patch.scripts">
             <field name="method">us_8805_product_set_archived</field>
@@ -686,5 +687,11 @@
             <field name="method">us_8869_remove_ir_import</field>
         </record>
 
+=======
+        <!-- UF22.0 -->
+        <record id="us_7449_set_cv_version" model="patch.scripts">
+            <field name="method">us_7449_set_cv_version</field>
+        </record>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-08-11 05:45:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-08-11 08:19:49 +0000
@@ -3925,6 +3925,7 @@
 #: field:account.invoice.tax,manual:0
 #: view:account.commitment:0
 #: selection:account.commitment,type:0
+#: selection:account.commitment.line,commit_type:0
 #: selection:purchase.order,invoice_method:0
 #: model:ir.ui.menu,name:sync_client.sync_wiz_menu
 msgid "Manual"
@@ -9634,6 +9635,7 @@
 
 #. module: analytic_distribution
 #: selection:account.commitment,type:0
+#: selection:account.commitment.line,commit_type:0
 msgid "Manual - ESC supplier"
 msgstr "Manuel - Fournisseur ESC"
 
@@ -30297,7 +30299,7 @@
 #: code:addons/purchase/purchase_order_line.py:1795
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr "Il n'y a pas de compte de charge définit pour ce produit : \"%s\" (id. : %d)"
+msgstr "Il n'y a pas de compte de charge défini pour ce produit : \"%s\" (id. : %d)"
 
 #. module: msf_outgoing
 #: report:packing.list:0
@@ -30674,7 +30676,7 @@
 #: code:addons/analytic_distribution_supply/invoice.py:147
 #, python-format
 msgid "There is no expense account defined for this PO line: \"%s\" (id:%d)"
-msgstr "There is no expense account defined for this PO line: \"%s\" (id:%d)"
+msgstr "Il n'y a pas de compte de charge défini pour cette ligne de BC : \"%s\" (id. : %d)"
 
 #. module: msf_doc_import
 #: view:msf.import.export:0
@@ -44516,12 +44518,6 @@
 msgid "Choose day"
 msgstr "Choisir un jour"
 
-#. module: analytic_distribution
-#: code:addons/analytic_distribution/account_commitment.py:161
-#, python-format
-msgid "No analytic distribution found for %s %s"
-msgstr "Pas de distribution analytique trouvée pour %s %s"
-
 #. modules: sync_so, analytic_distribution_supply, analytic_override, analytic_distribution
 #: code:addons/analytic_distribution/wizard/analytic_distribution_wizard.py:322
 #: code:addons/analytic_distribution/wizard/analytic_distribution_wizard.py:352
@@ -47492,6 +47488,7 @@
 #: view:account.bank.statement.line:0
 #: view:sale.order.line:0
 #: view:free.allocation.wizard:0
+#: view:account.commitment.line:0
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -68111,7 +68108,7 @@
 #: code:addons/analytic_distribution_supply/invoice.py:227
 #, python-format
 msgid "No analytic distribution found."
-msgstr "Pas de disribution analytique trouvée."
+msgstr "Pas de distribution analytique trouvée."
 
 #. module: base
 #: model:res.currency,currency_name:base.CHF
@@ -69423,9 +69420,32 @@
 
 #. module: analytic_distribution
 #: selection:account.commitment,type:0
+#: selection:account.commitment.line,commit_type:0
 msgid "Automatic - External supplier"
 msgstr "Automatique - Fournisseur Externe"
 
+#. module: analytic_distribution
+#: selection:account.commitment,type:0
+#: selection:account.commitment.line,commit_type:0
+msgid "Automatic - Intermission"
+msgstr "Automatique - Intermission"
+
+#. module: analytic_distribution
+#: selection:account.commitment,type:0
+#: selection:account.commitment.line,commit_type:0
+msgid "Automatic - Intersection"
+msgstr "Automatique - Intersection"
+
+#. module: analytic_distribution
+#: view:account.commitment:0
+msgid "Intermission Commitment Voucher"
+msgstr "Bon d'Engagement Intermission"
+
+#. module: analytic_distribution
+#: view:account.commitment:0
+msgid "Intersection Commitment Voucher"
+msgstr "Bon d'Engagement Intersection"
+
 #. module: procurement
 #: field:procurement.order,close_move:0
 msgid "Close Move at end"
@@ -82184,7 +82204,7 @@
 msgid "SFTP connection succeeded"
 msgstr "SFTP connection succeeded"
 
-#. modules: tender_flow, product_nomenclature, product_asset, account_override, product_attributes, register_accounting, product_expiry, procurement_cycle, return_claim, supplier_catalogue, import_data, mission_stock, unifield_setup, stock_forecast, stock_batch_recall, order_types, msf_doc_import, purchase_followup, product, stock_override, stock_schedule, service_purchasing, consumption_calculation, purchase_override, specific_rules, kit, base, product_list, product_manufacturer, procurement_report, threshold_value, purchase, account, msf_outgoing, stock_move_tracking, purchase_allocation_report, procurement_auto, sale, transport_mgmt, procurement, sourcing, msf_audittrail, purchase_msf, stock, sync_so, msf_tools
+#. modules: tender_flow, product_nomenclature, product_asset, account_override, product_attributes, register_accounting, product_expiry, procurement_cycle, return_claim, supplier_catalogue, import_data, mission_stock, unifield_setup, stock_forecast, stock_batch_recall, order_types, msf_doc_import, purchase_followup, product, stock_override, stock_schedule, service_purchasing, consumption_calculation, purchase_override, specific_rules, kit, base, product_list, product_manufacturer, procurement_report, threshold_value, purchase, account, msf_outgoing, stock_move_tracking, purchase_allocation_report, procurement_auto, sale, transport_mgmt, procurement, sourcing, msf_audittrail, purchase_msf, stock, sync_so, msf_tools, analytic_distribution
 #: field:account.analytic.line,product_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,product_id:0
@@ -82390,6 +82410,7 @@
 #: view:replenishment.segment.line.amc.past_fmc:0
 #: view:replenishment.segment.line.min_max_auto_supply.history:0
 #: field:view.expired.expiring.stock.lines,product_id:0
+#: field:account.commitment.line,po_line_product_id:0
 #, python-format
 msgid "Product"
 msgstr "Produit"
@@ -87510,7 +87531,7 @@
 msgstr "Ceci est utilisé uniquement si vous sélectionnez une localisation de type chainée.\n"
 "La valeur 'Mouvement automatique' créera un mouvement de stock après le mouvement actuel qui sera validé automatiquement. La valeur 'Opération manuelle', le mouvement de stock devra être validé par un opérateur. La valeur 'Automatique sans étape supplémentaire', la localisation est remplacée sur le mouvement d'origine."
 
-#. modules: msf_budget, sync_client, update_client, kit, base, msf_profile
+#. modules: msf_budget, sync_client, update_client, kit, base, msf_profile, analytic_distribution
 #: view:ir.module.module:0
 #: report:ir.module.reference:0
 #: view:composition.kit:0
@@ -87528,6 +87549,7 @@
 #: field:sync.client.update_to_send,version:0
 #: field:sync.version.instance.monitor,version:0
 #: field:sync_client.version,name:0
+#: field:account.commitment,version:0
 msgid "Version"
 msgstr "Version"
 
@@ -91254,13 +91276,21 @@
 msgid "Purchase Orders Waiting Confirmation"
 msgstr "Bons de Commandes en attente de Confirmation"
 
-#. modules: purchase, analytic_distribution, purchase_override
+#. modules: purchase, analytic_distribution, purchase_override, account_override, register_accounting
 #: field:account.commitment,line_ids:0
 #: view:account.commitment.line:0
+#: field:purchase.order.line,cv_line_ids:0
+#: field:purchase.order.merged.line,cv_line_ids:0
+#: field:account.invoice.line,cv_line_ids:0
+#: field:wizard.account.invoice.line,cv_line_ids:0
+msgid "Commitment Voucher Lines"
+msgstr "Lignes de Bon d'Engagement"
+
+#. modules: purchase, purchase_override
 #: field:purchase.order.line,commitment_line_ids:0
 #: field:purchase.order.merged.line,commitment_line_ids:0
-msgid "Commitment Voucher Lines"
-msgstr "Lignes de Bon d'Engagement"
+msgid "Commitment Voucher Lines (deprecated)"
+msgstr "Lignes de Bon d'Engagement (obsolète)"
 
 #. module: sync_client
 #: code:addons/sync_client/hq_monitor.py:48
@@ -98351,13 +98381,17 @@
 msgstr "Type de note"
 
 #. modules: purchase, analytic_distribution, msf_doc_import, finance
-#: field:account.commitment.line,purchase_order_line_ids:0
 #: view:purchase.order.line:0
 #: field:wizard.import.po,line_ids:0
 #: field:account.invoice.line,purchase_order_line_ids:0
 msgid "Purchase Order Lines"
 msgstr "Lignes Bon de Commande"
 
+#. module: analytic_distribution
+#: field:account.commitment.line,purchase_order_line_ids:0
+msgid "Purchase Order Lines (deprecated)"
+msgstr "Lignes Bon de Commande (obsolète)"
+
 #. module: specific_rules
 #: field:unconsistent.stock.report.line,product_bn:0
 msgid "BN management"
@@ -112379,6 +112413,7 @@
 #, python-format
 msgid "The Pre-Packing List is using a deactivated Delivery Address (%s). Please select another one to be able to process."
 msgstr "La Liste de Pré-Colisage utilise une Addresse de Livraison désactivée (%s). Veuillez en sélectionner une autre pour pouvoir continuer le traitement."
+<<<<<<< TREE
 
 #. module: sync_so
 #: code:addons/sync_so/so_po_common.py:491
@@ -112719,3 +112754,47 @@
 #, python-format
 msgid "Products moved in the last: %s month%s"
 msgstr "Mouvements de stock dans: %s dernier%s mois"
+=======
+
+#. module: sync_so
+#: code:addons/sync_so/so_po_common.py:491
+#, python-format
+msgid "Cannot process Document/line due to Product Code %s which does not exist in this instance"
+msgstr "Impossible de traiter le Document/la ligne. Le Code Produit %s n'existe pas dans cette instance"
+
+#. module: analytic_distribution
+#: help:account.commitment,version:0
+msgid "Technical field to distinguish old CVs from new ones which have a different behavior."
+msgstr "Champ technique pour distinguer les anciens Bons d'Engagement des nouveaux qui ont un comportement différent."
+
+#. module: analytic_distribution
+#: field:account.commitment,display_super_done_button:0
+msgid "Display the button allowing to always set a CV to Done"
+msgstr "Afficher le bouton permettant de toujours passer un Bon d'Engagement en Terminé"
+
+#. module: analytic_distribution
+#: field:account.commitment.line,commit_type:0
+msgid "Commitment Voucher Type"
+msgstr "Type de Bon d'Engagement"
+
+#. module: analytic_distribution
+#: field:account.commitment.line,po_line_id:0
+#: field:account.commitment.line,po_line_number:0
+msgid "PO Line"
+msgstr "Ligne du BC"
+
+#. module: analytic_distribution
+#: view:account.commitment:0
+msgid "Done (for Administrator only)"
+msgstr "Terminé (pour l'Administrateur uniquement)"
+
+#. module: analytic_distribution
+#: view:account.commitment:0
+msgid "You are about to set this Commitment Voucher to the state \"Done\". Do you want to proceed?"
+msgstr "Vous êtes sur le point de passer ce Bon d'Engagement à l'état \"Terminé\". Voulez-vous continuer ?"
+
+#. module: analytic_distribution
+#: view:account.commitment.line:0
+msgid "Do you really want to delete this line?"
+msgstr "Voulez-vous vraiment supprimer cette ligne ?"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2021-08-09 18:09:28 +0000
+++ bin/addons/msf_profile/msf_profile.py	2021-08-11 08:19:49 +0000
@@ -53,6 +53,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF22.0
     def us_8805_product_set_archived(self, cr, uid, *a, **b):
         if self.pool.get('sync_client.version') and self.pool.get('sync.client.entity'):
@@ -80,6 +81,18 @@
         cr.execute("update internal_request_import set file_to_import=NULL");
         return True
 
+=======
+    # UF22.0
+    def us_7449_set_cv_version(self, cr, uid, *a, **b):
+        """
+        Sets the existing Commitment Vouchers in version 1.
+        """
+        if self.pool.get('sync.client.entity'):  # existing instances
+            cr.execute("UPDATE account_commitment SET version = 1")
+            self._logger.warn('Commitment Vouchers: %s CV(s) set to version 1.', cr.rowcount)
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF21.1
     def us_8810_fake_updates(self, cr, uid, *a, **b):
         if self.pool.get('sync.client.entity'):
 
=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2021-08-10 16:21:09 +0000
+++ bin/addons/purchase/purchase_order.py	2021-08-11 08:19:49 +0000
@@ -2887,12 +2887,21 @@
                 ('instance_id', '=', self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id.id)
             ], limit=1, context=context)
 
+            po_partner_type = po.partner_id.partner_type
+            if po_partner_type == 'external':
+                cv_type = 'external'
+            elif po_partner_type == 'section':
+                cv_type = 'intersection'
+            elif po_partner_type == 'intermission':
+                cv_type = 'intermission'
+            else:
+                cv_type = 'manual'
             vals = {
                 'journal_id': engagement_ids and engagement_ids[0] or False,
                 'currency_id': po.currency_id and po.currency_id.id or False,
                 'partner_id': po.partner_id and po.partner_id.id or False,
                 'purchase_id': po.id or False,
-                'type': 'external' if po.partner_id.partner_type == 'external' else 'manual',
+                'type': cv_type,
             }
             # prepare some values
             period_ids = get_period_from_date(self, cr, uid, cv_date, context=context)
 
=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2021-08-10 16:13:59 +0000
+++ bin/addons/purchase/purchase_order_line.py	2021-08-11 08:19:49 +0000
@@ -568,8 +568,12 @@
         # finance
         'analytic_distribution_id': fields.many2one('analytic.distribution', 'Analytic Distribution'),
         'have_analytic_distribution_from_header': fields.function(_have_analytic_distribution_from_header, method=True, type='boolean', string='Header Distrib.?'),
+        # for CV in version 1
         'commitment_line_ids': fields.many2many('account.commitment.line', 'purchase_line_commitment_rel', 'purchase_id', 'commitment_id',
-                                                string="Commitment Voucher Lines", readonly=True),
+                                                string="Commitment Voucher Lines (deprecated)", readonly=True),
+        # for CV starting from version 2
+        # note: cv_line_ids is a o2m because of the related m2o on CV lines but it should only contain one CV line
+        'cv_line_ids': fields.one2many('account.commitment.line', 'po_line_id', string="Commitment Voucher Lines"),
         'analytic_distribution_state': fields.function(_get_distribution_state, method=True, type='selection',
                                                        selection=[('none', 'None'), ('valid', 'Valid'), ('invalid', 'Invalid')],
                                                        string="Distribution state", help="Informs from distribution state among 'none', 'valid', 'invalid."),
@@ -1295,7 +1299,7 @@
             self.pool.get('product.product')._get_restriction_error(cr, uid, [pol.product_id.id],
                                                                     {'partner_id': pol.order_id.partner_id.id}, context=context)
 
-        default.update({'state': 'draft', 'move_ids': [], 'invoiced': 0, 'invoice_lines': [], 'commitment_line_ids': [], })
+        default.update({'state': 'draft', 'move_ids': [], 'invoiced': 0, 'invoice_lines': [], 'commitment_line_ids': [], 'cv_line_ids': [], })
 
         for field in ['origin', 'move_dest_id', 'original_product', 'original_qty', 'original_price', 'original_uom', 'original_currency_id', 'modification_comment', 'sync_linked_sol', 'created_by_vi_import', 'external_ref']:
             if field not in default:
@@ -1868,14 +1872,17 @@
 
         import_commitments = self.pool.get('unifield.setup.configuration').get_config(cr, uid).import_commitments
         for pol in self.browse(cr, uid, ids, context=context):
-            # only create CV for external and ESC partners:
-            if pol.order_id.partner_id.partner_type not in ['external', 'esc']:
+            if pol.order_id.partner_id.partner_type == 'internal':
                 return False
 
             if pol.order_id.partner_id.partner_type == 'esc' and import_commitments:
                 return False
 
-            if pol.order_id.order_type in ['loan', 'in_kind']:
+            if pol.order_id.order_type in ['loan', 'in_kind', 'donation_st', 'donation_exp']:
+                return False
+
+            # exclude push flow (FO or FO line created first)
+            if pol.order_id.push_fo or pol.set_as_sourced_n:
                 return False
 
             commitment_voucher_id = self.pool.get('account.commitment').search(cr, uid, [('purchase_id', '=', pol.order_id.id), ('state', '=', 'draft')], context=context)
@@ -1886,42 +1893,63 @@
                     raise osv.except_osv(_('Error'), _('Delivery Confirmed Date is a mandatory field.'))
                 commitment_voucher_id = self.pool.get('purchase.order').create_commitment_voucher_from_po(cr, uid, [pol.order_id.id], cv_date=pol.confirmed_delivery_date, context=context)
 
-            # group PO line by account_id:
             expense_account = pol.account_4_distribution and pol.account_4_distribution.id or False
             if not expense_account:
                 raise osv.except_osv(_('Error'), _('There is no expense account defined for this line: %s (id:%d)') % (pol.name or '', pol.id))
 
+            # in CV in version 1, PO lines are grouped by account_id. Else 1 PO line generates 1 CV line.
+            cv_version = self.pool.get('account.commitment').read(cr, uid, commitment_voucher_id, ['version'], context=context)['version']
+            cc_lines = []
+            ad_header = []  # if filled in, the line itself has no AD but uses the one at header level
             if pol.analytic_distribution_id:
                 cc_lines = pol.analytic_distribution_id.cost_center_lines
-            else:
+            elif cv_version < 2:
+                # in CV in version 1, if there is no AD on the PO line, the AD at PO header level is used at CV line level
                 cc_lines = pol.order_id.analytic_distribution_id.cost_center_lines
+            else:
+                ad_header = pol.order_id.analytic_distribution_id.cost_center_lines
 
-            if not cc_lines:
+            if not cc_lines and not ad_header:
                 raise osv.except_osv(_('Warning'), _('Analytic allocation is mandatory for %s on the line %s for the product %s! It must be added manually.')
                                      % (pol.order_id.name, pol.line_number, pol.product_id and pol.product_id.default_code or pol.name or ''))
 
-
-            commit_line_id = self.pool.get('account.commitment.line').search(cr, uid, [('commit_id', '=', commitment_voucher_id), ('account_id', '=', expense_account)], context=context)
-            if not commit_line_id: # create new commitment line
-                distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {}, context=context)
-                commit_line_id = self.pool.get('account.commitment.line').create(cr, uid, {
+            new_cv_line = False
+            if cv_version > 1:
+                new_cv_line = True
+            else:
+                commit_line_id = self.pool.get('account.commitment.line').search(cr, uid,
+                                                                                 [('commit_id', '=', commitment_voucher_id),
+                                                                                  ('account_id', '=', expense_account)], context=context)
+                if not commit_line_id:
+                    new_cv_line = True
+            if new_cv_line:  # create new commitment line
+                if ad_header:  # the line has no AD itself, it uses the AD at header level
+                    distrib_id = False
+                else:
+                    distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {}, context=context)
+                commit_line_vals = {
                     'commit_id': commitment_voucher_id,
                     'account_id': expense_account,
                     'amount': pol.price_subtotal,
                     'initial_amount': pol.price_subtotal,
-                    'purchase_order_line_ids': [(4, pol.id)],
                     'analytic_distribution_id': distrib_id,
-                }, context=context)
-                for aline in cc_lines:
-                    vals = {
-                        'distribution_id': distrib_id,
-                        'analytic_id': aline.analytic_id.id,
-                        'currency_id': pol.order_id.currency_id.id,
-                        'destination_id': aline.destination_id.id,
-                        'percentage': aline.percentage,
-                    }
-                    self.pool.get('cost.center.distribution.line').create(cr, uid, vals, context=context)
-                self.pool.get('analytic.distribution').create_funding_pool_lines(cr, uid, [distrib_id], expense_account, context=context)
+                }
+                if cv_version > 1:
+                    commit_line_vals.update({'po_line_id': pol.id, })
+                else:
+                    commit_line_vals.update({'purchase_order_line_ids': [(4, pol.id)], })
+                commit_line_id = self.pool.get('account.commitment.line').create(cr, uid, commit_line_vals, context=context)
+                if distrib_id:
+                    for aline in cc_lines:
+                        vals = {
+                            'distribution_id': distrib_id,
+                            'analytic_id': aline.analytic_id.id,
+                            'currency_id': pol.order_id.currency_id.id,
+                            'destination_id': aline.destination_id.id,
+                            'percentage': aline.percentage,
+                        }
+                        self.pool.get('cost.center.distribution.line').create(cr, uid, vals, context=context)
+                    self.pool.get('analytic.distribution').create_funding_pool_lines(cr, uid, [distrib_id], expense_account, context=context)
 
             else: # update existing commitment line:
                 commit_line_id = commit_line_id[0]
 
=== modified file 'bin/addons/purchase/stock.py'
--- bin/addons/purchase/stock.py	2020-09-25 15:16:18 +0000
+++ bin/addons/purchase/stock.py	2021-08-11 08:19:49 +0000
@@ -34,58 +34,6 @@
         'purchase_id': False,
     }
 
-    def _get_address_invoice(self, cr, uid, picking):
-        """ Gets invoice address of a partner
-        @return {'contact': address, 'invoice': address} for invoice
-        """
-        res = super(stock_picking, self)._get_address_invoice(cr, uid, picking)
-        if picking.purchase_id:
-            partner_obj = self.pool.get('res.partner')
-            partner = picking.purchase_id.partner_id or picking.address_id.partner_id
-            data = partner_obj.address_get(cr, uid, [partner.id],
-                                           ['contact', 'invoice'])
-            res.update(data)
-        return res
-
-    def get_currency_id(self, cursor, user, picking):
-        if picking.purchase_id:
-            return picking.purchase_id.pricelist_id.currency_id.id
-        else:
-            return super(stock_picking, self).get_currency_id(cursor, user, picking)
-
-    def _get_comment_invoice(self, cursor, user, picking):
-        if picking.purchase_id and picking.purchase_id.notes:
-            if picking.note:
-                return picking.note + '\n' + picking.purchase_id.notes
-            else:
-                return picking.purchase_id.notes
-        return super(stock_picking, self)._get_comment_invoice(cursor, user, picking)
-
-    def _get_price_unit_invoice(self, cursor, user, move_line, type):
-        if move_line.purchase_line_id:
-            return move_line.purchase_line_id.price_unit
-        return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
-
-    def _get_discount_invoice(self, cursor, user, move_line):
-        if move_line.purchase_line_id:
-            return 0.0
-        return super(stock_picking, self)._get_discount_invoice(cursor, user, move_line)
-
-    def _get_taxes_invoice(self, cursor, user, move_line, type):
-        if move_line.purchase_line_id:
-            return [x.id for x in move_line.purchase_line_id.taxes_id]
-        return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
-
-    def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
-        if move_line.purchase_line_id:
-            return move_line.purchase_line_id.account_analytic_id.id
-        return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
-
-    def _invoice_hook(self, cursor, user, picking, invoice_id):
-        purchase_obj = self.pool.get('purchase.order')
-        if picking.purchase_id:
-            purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_id': invoice_id,})
-        return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
 
 stock_picking()
 
 
=== modified file 'bin/addons/sale/stock.py'
--- bin/addons/sale/stock.py	2019-09-18 14:06:52 +0000
+++ bin/addons/sale/stock.py	2021-08-11 08:19:49 +0000
@@ -40,65 +40,6 @@
         'sale_id': False
     }
 
-    def get_currency_id(self, cursor, user, picking):
-        if picking.sale_id:
-            return picking.sale_id.pricelist_id.currency_id.id
-        else:
-            return super(stock_picking, self).get_currency_id(cursor, user, picking)
-
-    def _get_payment_term(self, cursor, user, picking):
-        if picking.sale_id and picking.sale_id.payment_term:
-            return picking.sale_id.payment_term.id
-        return super(stock_picking, self)._get_payment_term(cursor, user, picking)
-
-    def _get_address_invoice(self, cursor, user, picking):
-        res = {}
-        if picking.sale_id:
-            res['contact'] = picking.sale_id.partner_order_id.id
-            res['invoice'] = picking.sale_id.partner_invoice_id.id
-            return res
-        return super(stock_picking, self)._get_address_invoice(cursor, user, picking)
-
-    def _get_comment_invoice(self, cursor, user, picking):
-        if picking.note or (picking.sale_id and picking.sale_id.note):
-            return picking.note or picking.sale_id.note
-        return super(stock_picking, self)._get_comment_invoice(cursor, user, picking)
-
-    def _get_price_unit_invoice(self, cursor, user, move_line, type):
-        if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
-            uom_id = move_line.product_id.uom_id.id
-            uos_id = move_line.product_id.uos_id and move_line.product_id.uos_id.id or False
-            price = move_line.sale_line_id.price_unit
-            coeff = move_line.product_id.uos_coeff
-            if uom_id != uos_id  and coeff != 0:
-                price_unit = price / coeff
-                return price_unit
-            return move_line.sale_line_id.price_unit
-        return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
-
-    def _get_discount_invoice(self, cursor, user, move_line):
-        if move_line.sale_line_id:
-            return move_line.sale_line_id.discount
-        return super(stock_picking, self)._get_discount_invoice(cursor, user, move_line)
-
-    def _get_taxes_invoice(self, cursor, user, move_line, type):
-        if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
-            return [x.id for x in move_line.sale_line_id.tax_id]
-        return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
-
-    def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
-        if picking.sale_id:
-            return picking.sale_id.project_id.id
-        return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
-
-    def _invoice_hook(self, cursor, user, picking, invoice_id):
-        sale_obj = self.pool.get('sale.order')
-        if picking.sale_id:
-            sale_obj.write(cursor, user, [picking.sale_id.id], {
-                'invoice_ids': [(4, invoice_id)],
-            })
-        return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
-
 
 stock_picking()
 
 
=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2021-08-09 14:13:09 +0000
+++ bin/addons/stock/stock.py	2021-08-11 08:19:49 +0000
@@ -1193,12 +1193,20 @@
         return True
 
     def get_currency_id(self, cr, uid, picking):
-        return False
+        if picking.sale_id:
+            return picking.sale_id.pricelist_id.currency_id.id
+        else:
+            if picking.purchase_id:
+                return picking.purchase_id.pricelist_id.currency_id.id
+            else:
+                return False
 
     def _get_payment_term(self, cr, uid, picking):
         """ Gets payment term from partner.
         @return: Payment term
         """
+        if picking.sale_id and picking.sale_id.payment_term:
+            return picking.sale_id.payment_term.id
         partner = picking.address_id.partner_id
         return partner.property_payment_term and partner.property_payment_term.id or False
 
@@ -1206,37 +1214,85 @@
         """ Gets invoice address of a partner
         @return {'contact': address, 'invoice': address} for invoice
         """
+        res = {}
         partner_obj = self.pool.get('res.partner')
+        if picking.sale_id:
+            res['contact'] = picking.sale_id.partner_order_id.id
+            res['invoice'] = picking.sale_id.partner_invoice_id.id
+            return res
         partner = picking.address_id.partner_id
-        return partner_obj.address_get(cr, uid, [partner.id],
-                                       ['contact', 'invoice'])
+        res = partner_obj.address_get(cr, uid, [partner.id], ['contact', 'invoice'])
+        if picking.purchase_id:
+            partner = picking.purchase_id.partner_id or picking.address_id.partner_id
+            data = partner_obj.address_get(cr, uid, [partner.id], ['contact', 'invoice'])
+            res.update(data)
+        return res
 
     def _get_comment_invoice(self, cr, uid, picking):
         """
         @return: comment string for invoice
         """
+        if picking.note or (picking.sale_id and picking.sale_id.note):
+            return picking.note or picking.sale_id.note
+        if picking.purchase_id and picking.purchase_id.notes:
+            if picking.note:
+                return picking.note + '\n' + picking.purchase_id.notes
+            else:
+                return picking.purchase_id.notes
         return picking.note or ''
 
     def _get_price_unit_invoice(self, cr, uid, move_line, type, context=None):
         """ Gets price unit for invoice
+        Updates the Unit price according to the UoM received and the UoM ordered
         @param move_line: Stock move lines
         @param type: Type of invoice
         @return: The price unit for the move line
         """
         if context is None:
             context = {}
-
-        if type in ('in_invoice', 'in_refund'):
-            # Take the user company and pricetype
-            context['currency_id'] = move_line.company_id.currency_id.id
-            amount_unit = move_line.product_id.price_get('standard_price', context)[move_line.product_id.id]
-            return amount_unit
-        else:
-            return move_line.product_id.list_price
+        res = None
+        if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
+            uom_id = move_line.product_id.uom_id.id
+            uos_id = move_line.product_id.uos_id and move_line.product_id.uos_id.id or False
+            price = move_line.sale_line_id.price_unit
+            coeff = move_line.product_id.uos_coeff
+            if uom_id != uos_id and coeff != 0:
+                price_unit = price / coeff
+                res = price_unit
+            else:
+                res = move_line.sale_line_id.price_unit
+        if res is None:
+            if move_line.purchase_line_id:
+                res = move_line.purchase_line_id.price_unit
+            else:
+                if type in ('in_invoice', 'in_refund'):
+                    # Take the user company and pricetype
+                    context['currency_id'] = move_line.company_id.currency_id.id
+                    amount_unit = move_line.product_id.price_get('standard_price', context)[move_line.product_id.id]
+                    res = amount_unit
+                else:
+                    res = move_line.product_id.list_price
+        if type == 'in_refund':
+            if move_line.picking_id and move_line.picking_id.purchase_id:
+                po_line_obj = self.pool.get('purchase.order.line')
+                po_line_id = po_line_obj.search(cr, uid, [('order_id', '=', move_line.picking_id.purchase_id.id),
+                                                          ('product_id', '=', move_line.product_id.id),
+                                                          ('state', '!=', 'cancel')
+                                                          ], limit=1)
+                if po_line_id:
+                    return po_line_obj.read(cr, uid, po_line_id[0], ['price_unit'])['price_unit']
+        if move_line.purchase_line_id:
+            po_uom_id = move_line.purchase_line_id.product_uom.id
+            move_uom_id = move_line.product_uom.id
+            uom_ratio = self.pool.get('product.uom')._compute_price(cr, uid, move_uom_id, 1, po_uom_id)
+            return res / uom_ratio
+        return res
 
     def _get_discount_invoice(self, cr, uid, move_line):
         '''Return the discount for the move line'''
-        return 0.0
+        if move_line.sale_line_id:
+            return move_line.sale_line_id.discount
+        return 0.0  # including if move_line.purchase_line_id
 
     def _get_taxes_invoice(self, cr, uid, move_line, type):
         """ Gets taxes on invoice
@@ -1244,6 +1300,10 @@
         @param type: Type of invoice
         @return: Taxes Ids for the move line
         """
+        if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
+            return [x.id for x in move_line.sale_line_id.tax_id]
+        if move_line.purchase_line_id:
+            return [x.id for x in move_line.purchase_line_id.taxes_id]
         if type in ('in_invoice', 'in_refund'):
             taxes = move_line.product_id.supplier_taxes_id
         else:
@@ -1259,7 +1319,11 @@
         else:
             return map(lambda x: x.id, taxes)
 
-    def _get_account_analytic_invoice(self, cr, uid, picking, move_line):
+    def _get_account_analytic_invoice(self, picking, move_line):
+        if picking.sale_id:
+            return picking.sale_id.project_id.id
+        if move_line.purchase_line_id:
+            return move_line.purchase_line_id.account_analytic_id.id
         return False
 
     def _invoice_line_hook(self, cr, uid, move_line, invoice_line_id, account_id):
@@ -1294,9 +1358,33 @@
         return True
 
     def _invoice_hook(self, cr, uid, picking, invoice_id):
-        '''Call after the creation of the invoice'''
+        """
+        Create a link between invoice and purchase_order.
+        Copy analytic distribution from purchase order to invoice (or from commitment voucher if it exists)
+
+        To call after the creation of the invoice
+        """
+        sale_obj = self.pool.get('sale.order')
+        purchase_obj = self.pool.get('purchase.order')
+        if invoice_id and picking:
+            po_id = picking.purchase_id and picking.purchase_id.id or False
+            so_id = picking.sale_id and picking.sale_id.id or False
+            if po_id:
+                self.pool.get('purchase.order').write(cr, uid, [po_id], {'invoice_ids': [(4, invoice_id)]})
+            if so_id:
+                self.pool.get('sale.order').write(cr, uid, [so_id], {'invoice_ids': [(4, invoice_id)]})
+            # Copy analytic distribution from purchase order or commitment voucher (if it exists) or sale order
+            self.pool.get('account.invoice').fetch_analytic_distribution(cr, uid, [invoice_id])
+        if picking.sale_id:
+            sale_obj.write(cr, uid, [picking.sale_id.id], {
+                'invoice_ids': [(4, invoice_id)],
+            })
+        if picking.purchase_id:
+            purchase_obj.write(cr, uid, [picking.purchase_id.id], {'invoice_id': invoice_id, })
         return
 
+    # action_invoice_create method has been removed because of the impossibility to retrieve DESTINATION from SO.
+
     def _get_invoice_type(self, pick):
         src_usage = dest_usage = None
         inv_type = None
@@ -1550,12 +1638,17 @@
         else:
             name = move_line.name
 
+        cv_line = move_line and move_line.purchase_line_id and move_line.purchase_line_id.cv_line_ids and \
+            move_line.purchase_line_id.cv_line_ids[0] or False
+        cv_version = cv_line and cv_line.commit_id and cv_line.commit_id.version or 1
         if inv_type in ('out_invoice', 'out_refund'):
             account_id = move_line.product_id.product_tmpl_id.\
                 property_account_income.id
             if not account_id:
                 account_id = move_line.product_id.categ_id.\
                     property_account_income_categ.id
+        elif cv_version > 1:
+            account_id = cv_line.account_id.id
         else:
             account_id = move_line.product_id.product_tmpl_id.\
                 property_account_expense.id
@@ -1567,14 +1660,15 @@
                                                   move_line, inv_type)
         discount = self._get_discount_invoice(cr, uid, move_line)
         tax_ids = self._get_taxes_invoice(cr, uid, move_line, inv_type)
-        account_analytic_id = self._get_account_analytic_invoice(cr, uid, picking, move_line)
+        account_analytic_id = self._get_account_analytic_invoice(picking, move_line)
 
         #set UoS if it's a sale and the picking doesn't have one
         uos_id = move_line.product_uos and move_line.product_uos.id or False
         if not uos_id and inv_type in ('out_invoice', 'out_refund'):
             uos_id = move_line.product_uom.id
-        account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
-        invoice_line_id = invoice_line_obj.create(cr, uid, {
+        if cv_version < 2:
+            account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
+        inv_vals = {
             'name': name,
             'origin': origin,
             'invoice_id': invoice_id,
@@ -1586,7 +1680,10 @@
             'quantity': move_line.product_uos_qty or move_line.product_qty,
             'invoice_line_tax_id': [(6, 0, tax_ids)],
             'account_analytic_id': account_analytic_id,
-        }, context=context)
+        }
+        if cv_version > 1:
+            inv_vals.update({'cv_line_ids': [(4, cv_line.id)],})
+        invoice_line_id = invoice_line_obj.create(cr, uid, inv_vals, context=context)
         self._invoice_line_hook(cr, uid, move_line, invoice_line_id, account_id)
 
         if picking.sale_id:
@@ -1613,7 +1710,7 @@
                     tax_ids = sale_line.tax_id
                     tax_ids = map(lambda x: x.id, tax_ids)
 
-                    account_analytic_id = self._get_account_analytic_invoice(cr, uid, picking, sale_line)
+                    account_analytic_id = self._get_account_analytic_invoice(picking, sale_line)
 
                     account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, picking.sale_id.partner_id.property_account_position, account_id)
                     invoice_line_id = invoice_line_obj.create(cr, uid, {
 
=== modified file 'bin/addons/stock/stock_move.py'
=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2021-08-10 16:18:43 +0000
+++ bin/addons/stock_override/stock.py	2021-08-11 08:19:49 +0000
@@ -870,29 +870,6 @@
 
         return res
 
-    def _get_price_unit_invoice(self, cr, uid, move_line, type):
-        '''
-        Update the Unit price according to the UoM received and the UoM ordered
-        '''
-        res = super(stock_picking, self)._get_price_unit_invoice(cr, uid, move_line, type)
-        if type == 'in_refund':
-            if move_line.picking_id and move_line.picking_id.purchase_id:
-                po_line_obj = self.pool.get('purchase.order.line')
-                po_line_id = po_line_obj.search(cr, uid, [('order_id', '=', move_line.picking_id.purchase_id.id),
-                                                          ('product_id', '=', move_line.product_id.id),
-                                                          ('state', '!=', 'cancel')
-                                                          ], limit=1)
-                if po_line_id:
-                    return po_line_obj.read(cr, uid, po_line_id[0], ['price_unit'])['price_unit']
-
-        if move_line.purchase_line_id:
-            po_uom_id = move_line.purchase_line_id.product_uom.id
-            move_uom_id = move_line.product_uom.id
-            uom_ratio = self.pool.get('product.uom')._compute_price(cr, uid, move_uom_id, 1, po_uom_id)
-            return res / uom_ratio
-
-        return res
-
     def action_confirm(self, cr, uid, ids, context=None):
         """
             stock.picking: action confirm
 
=== modified file 'bin/addons/sync_client/message.py'
=== modified file 'bin/addons/sync_so/picking.py'
=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2021-08-10 16:18:43 +0000
+++ bin/addons/sync_so/purchase.py	2021-08-11 08:19:49 +0000
@@ -332,7 +332,7 @@
             kind = 'update'
             pol_to_update = [pol_updated]
             confirmed_sequence = self.pool.get('purchase.order.line.state').get_sequence(cr, uid, [], 'confirmed', context=context)
-            po_line = self.browse(cr, uid, pol_updated, fields_to_fetch=['state', 'product_qty'], context=context)
+            po_line = self.browse(cr, uid, pol_updated, fields_to_fetch=['state', 'product_qty', 'price_unit', 'cv_line_ids'], context=context)
             pol_state = po_line.state
             if sol_dict['state'] in ['cancel', 'cancel_r']:
                 pol_values['cancelled_by_sync'] = True
@@ -340,6 +340,12 @@
                 # if the state is less than confirmed we update the PO line
                 if debug:
                     logger.info("Write pol id: %s, values: %s" % (pol_to_update, pol_values))
+                if po_line.cv_line_ids and po_line.cv_line_ids[0] and po_line.state == 'confirmed' and po_line.product_qty - pol_values.get('product_qty', po_line.product_qty) > 0.01:
+                    # update qty on confirmed po line: update CV line if any
+                    # from_cancel = True : do not trigger wkf transition draft -> open
+                    self.pool.get('account.invoice')._update_commitments_lines(cr, uid, [po_ids[0]], cvl_amount_dic={
+                        po_line.cv_line_ids[0].id: round((po_line.product_qty - pol_values['product_qty'])*po_line.price_unit, 2)
+                    }, from_cancel=True, context=context)
                 self.pool.get('purchase.order.line').write(cr, uid, pol_to_update, pol_values, context=context)
 
         if debug:
 
=== modified file 'bin/addons/sync_so/sale.py'
=== modified file 'bin/addons/sync_so/so_po_common.py'
=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2021-08-09 18:09:28 +0000
+++ bin/osv/expression.py	2021-08-11 08:19:49 +0000
@@ -360,8 +360,13 @@
                 if field.translate:
                     if operator in ('like', 'ilike', 'not like', 'not ilike'):
                         right = '%%%s%%' % right
+<<<<<<< TREE
                     if right and operator in ('like', 'ilike', 'not like', 'not ilike', '=like', '=ilike'):
                         right = right.replace('\\', '\\\\').replace('_', '\\_')
+=======
+                    if operator in ('like', 'ilike', 'not like', 'not ilike', '=like', '=ilike'):
+                        right = right.replace('\\', '\\\\').replace('_', '\\_')
+>>>>>>> MERGE-SOURCE
 
                     operator = {'=like':'like','=ilike':'ilike'}.get(operator,operator)
 
@@ -486,8 +491,13 @@
                     elif left in table._columns:
                         params = table._columns[left]._symbol_set[1](right)
 
+<<<<<<< TREE
                     if params and operator in ('like', 'ilike', 'not like', 'not ilike', '=like', '=ilike'):
                         params = params.replace('\\', '\\\\').replace('_', '\\_')
+=======
+                    if operator in ('like', 'ilike', 'not like', 'not ilike', '=like', '=ilike'):
+                        params = params.replace('\\', '\\\\').replace('_', '\\_')
+>>>>>>> MERGE-SOURCE
                     if add_null:
                         query = '(%s OR %s IS NULL)' % (query, left)