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

[jftempo]

[lp:~jfb-tempo-consulting/unifield-server/US-10835]

6441. By jftempo on 2023-05-03

Delete draft entries

6442. By jftempo on 2023-05-03

Ignore duplicates / report with errors / unicity constraint on all fields

6443. By jftempo on 2023-05-04

Import: unicity constraint with NULL, button to reset or keep wizard

6444. By jftempo on 2023-05-04

import error if qty <= 0

6445. By jftempo on 2023-05-05

French translations

6446. By jftempo on 2023-05-05

French translations

=== modified file 'bin/addons/account_hq_entries/__init__.py'
--- bin/addons/account_hq_entries/__init__.py	2012-08-14 09:25:23 +0000
+++ bin/addons/account_hq_entries/__init__.py	2023-05-05 12:01:38 +0000
@@ -1,29 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
-#    Developer: Olivier DOSSMANN
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 import res_company
 import hq_entries
 import wizard
 import account
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import esc_invoice
+import report
 
=== modified file 'bin/addons/account_hq_entries/__openerp__.py'
--- bin/addons/account_hq_entries/__openerp__.py	2017-09-28 14:05:02 +0000
+++ bin/addons/account_hq_entries/__openerp__.py	2023-05-05 12:01:38 +0000
@@ -33,6 +33,9 @@
         'security/ir.model.access.csv',
         'wizard/wizard_view.xml',
         'account_view.xml',
+        'esc_line_installer.xml',
+        'wizard/esc_lines_import_view.xml',
+        'esc_line_report.xml',
     ],
     "demo_xml" : [],
     "test": [
 
=== modified file 'bin/addons/account_hq_entries/account_view.xml'
--- bin/addons/account_hq_entries/account_view.xml	2022-10-13 12:32:09 +0000
+++ bin/addons/account_hq_entries/account_view.xml	2023-05-05 12:01:38 +0000
@@ -329,7 +329,162 @@
         <menuitem id="menu_hq" name="HQ" parent="account.menu_finance" sequence="6"/>
         <menuitem name="HQ Import" action="action_hq_entries_import_wizard" type="server" id="menu_hq_entries_import" parent="menu_hq" sequence="1"/>
         <menuitem name="HQ Entries" action="action_hq_entries_tree" id="menu_hq_entries" parent="menu_hq" sequence="2"/>
-        
+
+
+        <record id="esc_invoice_line_filter" model="ir.ui.view">
+            <field name="name">International Invoices Lines</field>
+            <field name="model">esc.invoice.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="International Invoices Lines">
+                    <filter icon="gtk-new" string="Not Done" domain="[('state', '!=', 'done')]" />
+                    <filter icon="gtk-apply" string="Done" domain="[('state', '=', 'done')]" />
+                    <separator orientation="vertical"/>
+                    <field name="po_name" />
+                    <field name="product_id" />
+                    <field name="requestor_cc_id" />
+                    <field name="consignee_cc_id"/>
+                    <field name="shipment_ref"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="PO Reference" icon="terp-partner" domain="[]" context="{'group_by':'po_name'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product"  icon="terp-folder-green" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Requestor" icon="terp-go-month" domain="[]" context="{'group_by':'requestor_cc_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Consignee" icon="gtk-about" domain="[]" context="{'group_by': 'consignee_cc_id'}"/>
+                    </group>
+                    <newline/>
+                </search>
+            </field>
+        </record>
+
+        <record id="esc_invoice_line_tree" model="ir.ui.view">
+            <field name="name">International Invoices Lines</field>
+            <field name="model">esc.invoice.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="International Invoices Line" editable="top" hide_new_button="1" hide_delete_button="1" hide_edit_button="1" noteditable="1">
+                        <field name="po_name" readonly="1"/>
+                        <field name="product_id" readonly="1" />
+                        <field name="requestor_cc_id" readonly="1" />
+                        <field name="consignee_cc_id" readonly="1" />
+                        <field name="shipment_ref" readonly="1" />
+                        <field name="price_unit" readonly="1" />
+                        <field name="currency_id" readonly="1" />
+                        <field name="product_qty" readonly="1" />
+                        <field name="remaining_qty" readonly="1" />
+                        <field name="in_number" />
+                        <field name="state" readonly="1" />
+                        <button name="delete" string="Delete" icon="gtk-del" type="object" states='1_draft' confirm="Do you want to delete this line ?" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="esc_invoice_line_form" model="ir.ui.view">
+            <field name="name">International Invoices Lines</field>
+            <field name="model">esc.invoice.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="International Invoices Line" hide_new_button="1" hide_duplicate_button="1">
+                        <field name="po_name" readonly="1" />
+                        <field name="product_id" readonly="1" />
+                        <field name="requestor_cc_id" readonly="1" />
+                        <field name="consignee_cc_id" readonly="1" />
+                        <field name="shipment_ref" readonly="1" />
+                        <field name="price_unit" readonly="1" />
+                        <field name="product_qty" readonly="1" />
+                        <field name="remaining_qty" readonly="1" />
+                        <field name="uom_id" readonly="1" />
+                        <field name="currency_id" readonly="1" />
+                        <field name="in_number" />
+                        <field name="state" readonly="1" />
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="esc_invoice_line_action">
+            <field name="name">International Invoices Lines</field>
+            <field name="res_model">esc.invoice.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="esc_invoice_line_tree"/>
+        </record>
+        <menuitem name="International Invoices Lines" action="esc_invoice_line_action" id="esc_invoice_line_menu" parent="menu_hq" sequence="20"/>
+
+
+
+        <record id="finance_price_track_changes_filter" model="ir.ui.view">
+            <field name="name">Line Matching</field>
+            <field name="model">finance_price.track_changes</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Line Matching">
+                    <field name="product_id" />
+                    <field name="stock_picking_id" />
+                    <field name="matching_type" />
+                    <field name="esc_invoice_line_id"/>
+                    <newline/>
+                </search>
+            </field>
+        </record>
+
+        <record id="finance_price_track_changes_tree" model="ir.ui.view">
+            <field name="name">Line Matching</field>
+            <field name="model">finance_price.track_changes</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Line Matching" editable="top" hide_new_button="1" hide_delete_button="1" hide_edit_button="1" noteditable="1">
+                        <field name="product_id" />
+                        <field name="old_price" />
+                        <field name="new_price" />
+                        <field name="qty_processed" />
+                        <field name="price_unit" />
+                        <field name="stock_before" />
+                        <field name="stock_picking_id" />
+                        <field name="stock_move_id" />
+                        <field name="purchase_oder_line_id" />
+                        <field name="esc_invoice_line_id" />
+                        <field name="matching_type" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="finance_price_track_changes_action">
+            <field name="name">Line Matching</field>
+            <field name="res_model">finance_price.track_changes</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'display_move_line': True}</field>
+        </record>
+        <menuitem name="Line Matching" action="finance_price_track_changes_action" id="finance_price_track_changes_menu" parent="menu_hq" sequence="30"/>
+
+        <act_window
+            id="esc_line_to_finance_price_tc"
+            name="Matching"
+            src_model="esc.invoice.line"
+            res_model="finance_price.track_changes"
+            target="current"
+            view_type="form"
+            view_mode="tree"
+            context="{'display_move_line': True}"
+            domain="[('esc_invoice_line_id', 'in', active_ids)]" />
+
+        <record id="esc_line_delete_action" model="ir.actions.server">
+            <field name="name">Delete Selected draft entries</field>
+            <field name="model_id" ref="model_esc_invoice_line"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.delete_action(context=context)</field>
+        </record>
+
+        <record id="esc_line_delete_menu" model="ir.values">
+            <field name="key2">client_action_multi</field>
+            <field name="model">esc.invoice.line</field>
+            <field name="name">Delete Selected draft entries</field>
+            <field eval="'ir.actions.server,%d'%esc_line_delete_action" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
 
     </data>
 </openerp>
 
=== added file 'bin/addons/account_hq_entries/esc_invoice.py'
--- bin/addons/account_hq_entries/esc_invoice.py	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/esc_invoice.py	2023-05-05 12:01:38 +0000
@@ -0,0 +1,203 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from osv import osv
+from osv import fields
+import decimal_precision as dp
+from tools.translate import _
+
+
+class esc_invoice_line(osv.osv):
+    _name = 'esc.invoice.line'
+    _description = 'International Invoices Line'
+    _rec_name = 'po_name'
+    _order = 'id desc'
+    _sync_order = 'id'
+    _trace = True
+
+    def _auto_init(self, cr, context=None):
+        super(esc_invoice_line, self)._auto_init(cr, context)
+        if not cr.index_exists('esc_invoice_line', 'esc_invoice_line_line_unique_all_field_idx'):
+            cr.execute("CREATE UNIQUE INDEX esc_invoice_line_line_unique_all_field_idx ON esc_invoice_line (po_name,requestor_cc_id,coalesce(consignee_cc_id, 0),product_id,product_qty,price_unit,coalesce(shipment_ref,''),currency_id)")
+
+
+    def _get_dest_instance_id(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        cur_instance = self.pool.get('res.company')._get_instance_record(cr, uid)
+        if cur_instance.level != 'section':
+            hq_id = cur_instance.parent_id.parent_id and cur_instance.parent_id.parent_id.id or cur_instance.parent_id.id or False
+            for _id in ids:
+                res[_id] = hq_id
+            return res
+
+        for esc_line in self.browse(cr, uid, ids, fields_to_fetch=['requestor_cc_id', 'consignee_cc_id'], context=context):
+            cc = esc_line.consignee_cc_id or esc_line.requestor_cc_id
+            res[esc_line.id] = cc.po_fo_cc_instance_ids and cc.po_fo_cc_instance_ids[0].id or False
+        return res
+
+    def _get_in_number(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        if not ids:
+            return {}
+
+        for _id in ids:
+            res[_id] = False
+
+        cr.execute('''
+            select
+                tc.esc_invoice_line_id, string_agg(distinct(pick.name),' ' order by pick.name)
+            from
+                finance_price_track_changes tc, stock_move m, stock_picking pick
+            where
+                m.id = tc.stock_move_id
+                and m.picking_id = pick.id
+                and tc.esc_invoice_line_id in %s
+            group by
+                tc.esc_invoice_line_id
+            ''', (tuple(ids), ))
+        for x in cr.fetchall():
+            res[x[0]] = x[1]
+        return res
+
+    _columns = {
+        'po_name': fields.char('PO Reference', size=64, required=1, select=1),
+        'requestor_cc_id': fields.many2one('account.analytic.account', 'Requestor Cost Center', required=1, domain="[('category','=', 'OC'), ('type', '!=', 'view')]"),
+        'consignee_cc_id': fields.many2one('account.analytic.account', 'Consignee Cost Center', domain="[('category','=', 'OC'), ('type', '!=', 'view')]"),
+        'imported_consignee_instance': fields.char('Consignee Instance', size=128),
+        'dest_instance_id': fields.function(_get_dest_instance_id, method=1, type='many2one', relation='msf.instance', string='Destination Instance'),
+        'product_id': fields.many2one('product.product', 'Product', required=1, select=1),
+        'price_unit': fields.float('Unit Price', required=1, digits_compute=dp.get_precision('Purchase Price Computation')),
+        'product_qty': fields.float('Quantity', required=True, digits=(16, 2), related_uom='uom_id'),
+        'remaining_qty': fields.float('Remaining Quantity', digits=(16, 2), readonly=1, related_uom='uom_id'),
+        'uom_id': fields.many2one('product.uom', 'UoM'),
+        'currency_id': fields.many2one('res.currency', 'Currency', required=1),
+        'shipment_ref': fields.char('Field mapping with IN', size=128),
+
+        'in_number': fields.function(_get_in_number, type='char', method=True, string='IN Number'),
+        'state': fields.selection([('1_draft', 'Draft'), ('0_open', 'Open'), ('done', 'Done')], 'State', readonly=1),
+
+    }
+
+    _defaults = {
+        'state': '1_draft',
+    }
+
+
+    _sql_constraints = [
+        ('product_qty', 'check(product_qty>0)', 'Quantity must be greater than 0.'),
+    ]
+
+
+    def _update_remaining(self, cr, uid, ids, vals, context=None):
+        if not ids:
+            return
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if 'product_qty' in vals and vals.get('state', '1_draft') == '1_draft':
+            cr.execute("update esc_invoice_line set remaining_qty=product_qty where state='1_draft' and id in %s", (tuple(ids), ))
+
+
+    def write(self, cr, uid, ids, vals, context=None):
+        ret = super(esc_invoice_line, self).write(cr, uid, ids, vals, context)
+        self._update_remaining(cr, uid, ids, vals, context)
+        return ret
+
+    def create(self, cr, uid, vals, context=None):
+        new_id = super(esc_invoice_line, self).create(cr, uid, vals, context)
+        self._update_remaining(cr, uid, [new_id], vals, context)
+        return new_id
+
+    def delete_action(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        active_ids = context.get('active_ids')
+        self.delete(cr, uid, active_ids, context=context)
+        return {'type': 'ir.actions.refresh_o2m', 'o2m_refresh': '_terp_list'}
+
+    def delete(self, cr, uid, ids, context=None):
+        to_del_ids = self.search(cr, uid, [('id', 'in', ids), ('state', '=', '1_draft')], context=context)
+        if to_del_ids:
+            self.unlink(cr, uid, to_del_ids, context=context)
+        return True
+
+
+
+esc_invoice_line()
+
+class finance_price_track_changes(osv.osv):
+    _name = 'finance_price.track_changes'
+    _rec_name = 'product_id'
+    _description = 'International Invoices Lines Matching'
+    _order = 'id desc'
+
+    _columns = {
+        'product_id': fields.many2one('product.product', string='Product', required=True, readonly=True,  ondelete='cascade', select=1),
+        'old_price': fields.float(string='Previous Finance Price', digits_compute=dp.get_precision('Purchase Price Computation'), required=False, readonly=True),
+        'new_price': fields.float(string='New Finance Price', digits_compute=dp.get_precision('Purchase Price Computation'), required=False, readonly=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'date': fields.datetime('Date', readonly=True),
+        'qty_processed': fields.float('Quantity Processed', readonly=True, digits=(16, 2)),
+        'price_unit': fields.float('Unit Price', required=1, digits_compute=dp.get_precision('Purchase Price Computation'), readonly=True),
+        'stock_before': fields.float('Qty in Stock Before', readonly=True, digits=(16, 2)),
+        'matching_type': fields.selection([('iil', 'International Lines'), ('po', 'PO'), ('invoice', 'Invoice')], 'Matching Type', readonly=True),
+
+        'stock_move_id': fields.many2one('stock.move', 'Move line', readonly=True),
+        'stock_picking_id': fields.related('stock_move_id', 'picking_id', string='IN', type='many2one', relation='stock.picking', readonly=True, domain="[('type', '=', 'in'), ('state', '=', 'done')]"),
+
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
+
+        'purchase_oder_line_id': fields.many2one('purchase.order.line', 'PO line', readonly=True),
+
+        'esc_invoice_line_id': fields.many2one('esc.invoice.line', 'International Line', readonly=True),
+        'comment': fields.char('Comment', size=256),
+    }
+
+    _defaults = {
+        'user_id': lambda self, cr, uid, *a, **b: hasattr(uid, 'realUid') and uid.realUid or uid,
+        'date': lambda *a:  fields.datetime.now(),
+    }
+
+finance_price_track_changes()
+
+class esc_line_setup(osv.osv_memory):
+    _name = 'esc_line.setup'
+    _inherit = 'res.config'
+
+    _columns = {
+        'esc_line': fields.boolean(string='Activate International Invoices Lines ?'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None, from_web=False):
+        """
+        """
+        if context is None:
+            context = {}
+        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+        res = super(esc_line_setup, self).default_get(cr, uid, fields, context=context, from_web=from_web)
+        res['esc_line'] = setup.esc_line
+        return res
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not isinstance(ids, list) or len(ids) != 1:
+            raise osv.except_osv(_('Error'), _('An error has occurred with the item retrieved from the form. Please contact an administrator if the problem persists.'))
+        wiz = self.browse(cr, uid, ids[0], fields_to_fetch=['esc_line'], context=context)
+        setup_obj = self.pool.get('unifield.setup.configuration')
+        setup = setup_obj.get_config(cr, uid)
+        if setup:
+            for module, xmlid in [('account_hq_entries', 'finance_price_track_changes_menu'), ('account_hq_entries', 'esc_invoice_line_menu'), ('account_hq_entries', 'esc_line_import_menu')]:
+                menu_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xmlid)[1]
+                self.pool.get('ir.ui.menu').write(cr, uid, menu_id, {'active': wiz.esc_line}, context=context)
+            report_fin_price_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_hq_entries', 'report_finance_cost_price')[1]
+            ir_value_id = self.pool.get('ir.values').search(cr, uid, [('key', '=', 'action'), ('key2', '=', 'client_print_multi'), ('model', '=', 'product.product'), ('value', '=', 'ir.actions.report.xml,%d'%report_fin_price_id)], context=context)
+            if ir_value_id:
+                user_id = False
+                if not wiz.esc_line:
+                    user_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'user_sync')[1]
+                self.pool.get('ir.values').write(cr, uid, ir_value_id, {'user_id': user_id}, context=context)
+
+            setup_obj.write(cr, uid, [setup.id], {'esc_line': wiz.esc_line}, context=context)
+
+esc_line_setup()
 
=== added file 'bin/addons/account_hq_entries/esc_line_installer.xml'
--- bin/addons/account_hq_entries/esc_line_installer.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/esc_line_installer.xml	2023-05-05 12:01:38 +0000
@@ -0,0 +1,48 @@
+<openerp>
+  <data>
+    <record id="view_esc_line_setup" model="ir.ui.view">
+      <field name="name">International Invoices Lines</field>
+      <field name="model">esc_line.setup</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes">
+            <attribute name="string">Activate International Invoices Lines</attribute>
+          </form>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string"></attribute>
+          </xpath>
+          <xpath expr='//separator[@string="title"]' position='attributes'>
+                    <attribute name='string'>Activate International Invoices Lines</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='rowspan'>25</attribute>
+                    <attribute name='string'></attribute>
+          </xpath>
+          <group string="res_config_contents" position="replace">
+              <group colspan="5">
+                <field name="esc_line" />
+              </group>
+           </group>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_esc_line_setup" model="ir.actions.act_window">
+      <field name="name">Activate International Invoices Lines</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">esc_line.setup</field>
+      <field name="view_id" ref="view_esc_line_setup"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="esc_line_setup_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_esc_line_setup"/>
+        <field name="sequence">16</field>
+        <field name="restart">always</field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'bin/addons/account_hq_entries/esc_line_report.xml'
--- bin/addons/account_hq_entries/esc_line_report.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/esc_line_report.xml	2023-05-05 12:01:38 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <report
+            id="report_finance_cost_price"
+            string="Track Changes Finance Price"
+            model="product.product"
+            name="report_finance_cost_price"
+            report_type="openpyxl"
+            header="False"
+            auto="False"
+            menu="True"
+            sequence="110"
+         />
+
+
+        <report
+            id="esc_line_import_template"
+            string="International Invoices Lines Template"
+            model="esc.line.import"
+            name="esc_line_import_template"
+            file="account_hq_entries/report/esc_line_import_template.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+         />
+
+        <report
+            id="esc_line_import_rejected"
+            string="International Invoices Rejected Lines"
+            model="esc.line.import"
+            name="esc_line_import_rejected"
+            file="account_hq_entries/report/esc_line_import_template.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+         />
+    </data>
+</openerp>
 
=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2022-10-13 08:11:44 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2023-05-05 12:01:38 +0000
@@ -4,7 +4,6 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
-#    Developer: Olivier DOSSMANN
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
 
=== added directory 'bin/addons/account_hq_entries/report'
=== added file 'bin/addons/account_hq_entries/report/__init__.py'
--- bin/addons/account_hq_entries/report/__init__.py	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/report/__init__.py	2023-05-05 12:01:38 +0000
@@ -0,0 +1,2 @@
+import finance_cost_price
+import esc_line_import_report
 
=== added file 'bin/addons/account_hq_entries/report/esc_line_import_report.py'
--- bin/addons/account_hq_entries/report/esc_line_import_report.py	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/report/esc_line_import_report.py	2023-05-05 12:01:38 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+from tools.safe_eval import safe_eval
+
+class ErrorLine(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(ErrorLine, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'get_row': self.get_row,
+            'with_error': lambda *a: True,
+        })
+
+    def get_row(self, obj_id):
+        rej_obj = self.pool.get('esc.line.import.rejected')
+
+        limit = 500
+        offset = 0
+        while True:
+            ids = rej_obj.search(self.cr, self.uid, [('wiz_id', '=', obj_id)], offset=offset, limit=limit)
+            offset += limit
+            if not ids:
+                raise StopIteration
+
+            for x in rej_obj.browse(self.cr, self.uid, ids):
+                rows = safe_eval(x.xls_row)
+                yield rows, x.error
+
+            if len(ids) < limit:
+                raise StopIteration
+
+SpreadsheetReport('report.esc_line_import_rejected', 'esc.line.import', 'account_hq_entries/report/esc_line_import_template.mako', parser=ErrorLine)
+
+
+class Template(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(Template, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'get_row': lambda *a, **b: [],
+            'with_error': lambda *a: False,
+        })
+
+SpreadsheetReport('report.esc_line_import_template', 'esc.line.import', 'account_hq_entries/report/esc_line_import_template.mako', parser=Template)
+
 
=== added file 'bin/addons/account_hq_entries/report/esc_line_import_template.mako'
--- bin/addons/account_hq_entries/report/esc_line_import_template.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/report/esc_line_import_template.mako	2023-05-05 12:01:38 +0000
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>MSFUser</Author>
+  <LastAuthor>Loic MANGERET</LastAuthor>
+  <Created>2012-06-18T15:46:09Z</Created>
+  <LastSaved>2023-03-24T14:45:03Z</LastSaved>
+  <Company>Medecins Sans Frontieres</Company>
+  <Version>16.00</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>7910</WindowHeight>
+  <WindowWidth>19200</WindowWidth>
+  <WindowTopX>32767</WindowTopX>
+  <WindowTopY>32767</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="s62">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection ss:Protected="0"/>
+  </Style>
+  <Style ss:ID="s63">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders/>
+   <Font ss:FontName="Arial" ss:Color="#000000" ss:Bold="1"/>
+   <Interior ss:Color="#FFCC99" ss:Pattern="Solid"/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="Sheet 1">
+  <Table x:FullColumns="1"
+   x:FullRows="1" ss:DefaultRowHeight="14.5">
+   <Column ss:StyleID="s62" ss:AutoFitWidth="0" ss:Width="149"/>
+   <Column ss:StyleID="s62" ss:AutoFitWidth="0" ss:Width="145" ss:Span="1"/>
+   <Column ss:Index="4" ss:StyleID="s62" ss:Width="173" ss:Span="1"/>
+   <Column ss:Index="6" ss:StyleID="s62" ss:AutoFitWidth="0" ss:Width="216.5"/>
+   <Column ss:StyleID="s62" ss:Width="73"/>
+   <Column ss:StyleID="s62" ss:AutoFitWidth="0" ss:Width="120"/>
+    % if with_error():
+        <Column ss:StyleID="s62" ss:AutoFitWidth="0" ss:Width="216"/>
+    % endif
+   <Row ss:AutoFitHeight="0" ss:Height="26.5">
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Order Reference</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Requestor instance reference/Cost Center</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Consignee UF instance/reference</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Product Code / Item code</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Quantities</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Unit Price</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Currency</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Field mapping with IN</Data></Cell>
+    % if with_error():
+        <Cell ss:StyleID="s63"><Data ss:Type="String">Error</Data></Cell>
+    % endif
+   </Row>
+   % for rows in get_row(objects[0].id):
+        <Row>
+            % for cell in rows[0]:
+                <Cell>
+                % if cell['type'] in ('float', 'int') and cell['data']:
+                    <Data ss:Type="Number">${cell['data'] or ''}</Data>
+                % else:
+                    <Data ss:Type="String">${cell['data'] or ''}</Data>
+                % endif
+                </Cell>
+            % endfor
+            % for num in range(len(rows[0]), 8):
+                <Cell />
+            % endfor
+            <Cell><Data ss:Type="String">${rows[1]}</Data></Cell>
+        </Row>
+   % endfor
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <Unsynced/>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveCol>4</ActiveCol>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+   <EnableSelection>UnlockedCells</EnableSelection>
+   <AllowInsertRows/>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>
 
=== added file 'bin/addons/account_hq_entries/report/finance_cost_price.py'
--- bin/addons/account_hq_entries/report/finance_cost_price.py	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/report/finance_cost_price.py	2023-05-05 12:01:38 +0000
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+from spreadsheet_xml.xlsx_write import XlsxReport
+from spreadsheet_xml.xlsx_write import XlsxReportParser
+from datetime import datetime
+from tools.translate import _
+
+
+class finance_cost_price(XlsxReportParser):
+
+    def generate(self, context=None):
+        if context is None:
+            context = {}
+
+        sheet = self.workbook.active
+
+        self.create_style_from_template('head_title', 'A1')
+        self.create_style_from_template('head_content', 'C1')
+        self.create_style_from_template('date_content', 'C5')
+
+        self.create_style_from_template('row_title', 'A7')
+
+        date_st = [
+            self.create_style_from_template('date_odd', 'A8'),
+            self.create_style_from_template('date_even', 'A9')
+        ]
+
+        txt_st = [
+            self.create_style_from_template('txt_odd', 'B8'),
+            self.create_style_from_template('txt_even', 'B9')
+        ]
+
+        float_st = [
+            self.create_style_from_template('float_odd', 'G8'),
+            self.create_style_from_template('float_even', 'G9')
+        ]
+
+
+        self.duplicate_column_dimensions(default_width=20.43)
+        sheet.freeze_panes = 'A8'
+
+
+        prod = self.pool.get('product.product').browse(self.cr, self.uid, self.ids[0], fields_to_fetch=['default_code', 'name', 'company_id'], context=context)
+        sheet.title = prod.default_code
+
+        sheet.merged_cells.ranges.append("A1:B1")
+        sheet.merged_cells.ranges.append("C1:F1")
+        sheet.append([self.cell_ro(_('Instance'), 'head_title'), self.cell_ro('', 'head_title'),  self.cell_ro(prod.company_id.instance_id.instance, 'head_content')] + [self.cell_ro('', 'head_content')]*3)
+
+        sheet.merged_cells.ranges.append("A2:B2")
+        sheet.merged_cells.ranges.append("C2:F2")
+        sheet.append([self.cell_ro(_('Product code'), 'head_title'), self.cell_ro('', 'head_title'),  self.cell_ro(prod.default_code, 'head_content')] + [self.cell_ro('', 'head_content')]*3)
+
+        sheet.merged_cells.ranges.append("A3:B3")
+        sheet.merged_cells.ranges.append("C3:F3")
+        sheet.append([self.cell_ro(_('Product Description'), 'head_title'), self.cell_ro('', 'head_title'),  self.cell_ro(prod.name, 'head_content')] + [self.cell_ro('', 'head_content')]*3)
+
+        sheet.merged_cells.ranges.append("A4:B4")
+        sheet.merged_cells.ranges.append("C4:F4")
+        sheet.append([self.cell_ro(_('Currency'), 'head_title'), self.cell_ro('', 'head_title'), self.cell_ro(prod.company_id.currency_id.name, 'head_content')] + [self.cell_ro('', 'head_content')]*3)
+
+        sheet.merged_cells.ranges.append("A5:B5")
+        sheet.merged_cells.ranges.append("C5:F5")
+        sheet.append([self.cell_ro(_('Generation Date'), 'head_title'), self.cell_ro('', 'head_title'), self.cell_ro(datetime.now(), 'date_content')] + [self.cell_ro('', 'head_content')]*3)
+
+        sheet.append([])
+
+        sheet.append([
+            self.cell_ro(_('Date'), 'row_title'),
+            self.cell_ro(_('User'), 'row_title'),
+            self.cell_ro(_('Old Finance Price'), 'row_title'),
+            self.cell_ro(_('New Finance Price'), 'row_title'),
+            self.cell_ro(_('Transaction'), 'row_title'),
+            self.cell_ro(_('Stock Level Before'), 'row_title'),
+            self.cell_ro(_('Qty Processed'), 'row_title'),
+            self.cell_ro(_('Unit Price'), 'row_title'),
+            self.cell_ro(_('Matching Type'), 'row_title'),
+        ])
+
+        matching_obj = self.pool.get('finance_price.track_changes')
+        matching_ids = matching_obj.search(self.cr, self.uid, [('product_id', '=', prod.id)], order='id desc', context=context)
+
+        color = 1
+        previous_in = 0
+        for tc in matching_obj.browse(self.cr, self.uid, matching_ids, context=context):
+            if abs(tc.new_price - tc.old_price) < 0.0001:
+                continue
+
+            if previous_in != tc.stock_move_id.id:
+                previous_in = tc.stock_move_id.id
+                color = 1 - color
+            sheet.append([
+                self.cell_ro(tc.date and datetime.strptime(tc.date, '%Y-%m-%d %H:%M:%S') or '', date_st[color]),
+                self.cell_ro(tc.user_id.name, txt_st[color]),
+                self.cell_ro(round(tc.old_price, 5), float_st[color]),
+                self.cell_ro(round(tc.new_price, 5), float_st[color]),
+                self.cell_ro(tc.stock_picking_id and tc.stock_picking_id.name or tc.invoice_id and tc.invoice_id.name or tc.comment or '', txt_st[color]),
+                self.cell_ro(tc.stock_before, float_st[color]),
+                self.cell_ro(tc.qty_processed, float_st[color]),
+                self.cell_ro(round(tc.price_unit, 5), float_st[color]),
+                self.cell_ro(self.getSel(tc, 'matching_type'), txt_st[color]),
+            ])
+
+XlsxReport('report.report_finance_cost_price', parser=finance_cost_price, template='addons/account_hq_entries/report/finance_cost_price.xlsx')
+
 
=== added file 'bin/addons/account_hq_entries/report/finance_cost_price.xlsx'
 Binary files bin/addons/account_hq_entries/report/finance_cost_price.xlsx and bin/addons/account_hq_entries/report/finance_cost_price.xlsx differ
=== modified file 'bin/addons/account_hq_entries/wizard/__init__.py'
--- bin/addons/account_hq_entries/wizard/__init__.py	2013-11-19 10:37:31 +0000
+++ bin/addons/account_hq_entries/wizard/__init__.py	2023-05-05 12:01:38 +0000
@@ -26,4 +26,5 @@
 import hq_entries_validation
 import hq_entries_split
 import hq_entries_unsplit
+import esc_lines_import
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'bin/addons/account_hq_entries/wizard/esc_lines_import.py'
--- bin/addons/account_hq_entries/wizard/esc_lines_import.py	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/wizard/esc_lines_import.py	2023-05-05 12:01:38 +0000
@@ -0,0 +1,351 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from osv import osv
+from osv import fields
+from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
+import threading
+import pooler
+import tools
+from tools.translate import _
+import time
+import base64
+import re
+from psycopg2 import IntegrityError
+
+
+class esc_line_import_rejected(osv.osv):
+    _name = 'esc.line.import.rejected'
+    _description = 'Rejected Lines'
+    _rec_name = 'wiz_id'
+    _order = 'wiz_id desc, id asc'
+
+    _columns = {
+        'wiz_id': fields.many2one('esc.line.import', 'Import', required=1),
+        'error': fields.text('Reason'),
+        'xls_row': fields.text('Row'),
+    }
+
+esc_line_import_rejected()
+
+class esc_line_import_wizard(osv.osv):
+    _name = 'esc.line.import'
+    _description = 'Import International Invoices Lines'
+    _rec_name = 'start_date'
+
+    _columns = {
+        'file': fields.binary(string="File"),
+        'filename': fields.char(string="Imported filename", size=256),
+        'progress': fields.integer(string="Progression", readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('inprogress', 'In-progress'), ('error', 'Error'), ('done', 'Done'), ('ack', 'ack')],'State', readonly=1),
+        'created': fields.integer('Processed', readonly=1),
+        'total': fields.integer('Total', readonly=1),
+        'nberrors': fields.integer('Errors', readonly=1),
+        'error': fields.text('Error', readonly=1),
+        'start_date': fields.datetime('Start Date', readonly=1),
+        'end_date': fields.datetime('End Date', readonly=1),
+    }
+
+    _defaults = {
+        'state': 'draft',
+    }
+
+    def __init__(self, pool, cr):
+        super(esc_line_import_wizard, self).__init__(pool, cr)
+        if cr.column_exists('esc_line_import_wizard', 'state'):
+            cr.execute("update esc_line_import_wizard set state='error' where state='inprogress'")
+        if cr.column_exists('esc_line_import_wizard', 'file'):
+            cr.execute("update esc_line_import_wizard set file=null where file is not null")
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        # remove concurrency warning on refresh
+        if self.CONCURRENCY_CHECK_FIELD in context:
+            del context[self.CONCURRENCY_CHECK_FIELD]
+        return super(esc_line_import_wizard, self).write(cr, uid, ids, vals, context)
+
+    def open_wizard(self, cr, uid, ids, context=None):
+        """
+            on click on menutim: display the running hq import
+        """
+        if self.pool.get('res.company')._get_instance_level(cr, uid) != 'section':
+            raise osv.except_osv(_('Warning'), ('This object can only be imported at HQ level'))
+
+        ids = self.search(cr, uid, [('state', 'in', ['inprogress', 'error', 'done'])], context=context)
+        if ids:
+            res_id = ids[0]
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_hq_entries', 'esc_line_import_progress_wizard')[1]
+        else:
+            res_id = False
+            view_id = False
+        return {
+            'name': _('Import International Invoices Lines'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'esc.line.import',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': [view_id],
+            'res_id': res_id,
+            'target': 'new',
+            'context': context,
+        }
+
+    def get_template_file(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'esc_line_import_template',
+            'datas': {'target_filename': _('International Invoices Lines Template'), 'keep_open': 1},
+            'context': context,
+        }
+
+    def get_error_file(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'esc_line_import_rejected',
+            'datas': {'target_filename': _('International Invoices Rejected Lines'), 'keep_open': 1, 'active_id': ids[0]},
+            'context': context,
+        }
+
+    def button_validate(self, cr, uid, ids, context=None):
+        """
+        Take a CSV file and fetch some informations for HQ Entries
+        """
+        # Do verifications
+        if not context:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if not self.browse(cr, uid, ids[0], context=context).file:
+            raise osv.except_osv(_('Warning'), _('No file to import'))
+
+        threading.Thread(target=self.load_bg, args=(cr.dbname, uid, ids[0], context)).start()
+        self.write(cr, uid, ids[0], {'state': 'inprogress', 'progress': 0}, context=context)
+
+        view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_hq_entries', 'esc_line_import_progress_wizard')[1]
+        return {
+            'name': _('Import International Invoices Lines'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'esc.line.import',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': [view_id],
+            'res_id': ids[0],
+            'target': 'new',
+            'context': context,
+        }
+
+
+    def load_bg(self, dbname, uid, wiz_id, context=None):
+        def manage_error(line_index, msg, row):
+            errors.append(_('Line %s, %s') % (line_index, _(msg)))
+            line_data = []
+            len_cell = len(row.cells)
+            for x in range(0, min(len_cell, 8)):
+                line_data.append({'type': row.cells[x].type, 'data': row.cells[x].data})
+            self.pool.get('esc.line.import.rejected').create(cr, uid, {'wiz_id': wiz_id, 'error': msg, 'xls_row': tools.ustr(line_data)}, context=context)
+
+        errors = []
+        curr_cache = {}
+        product_cache = {}
+        cost_center = {}
+
+        created = 0
+        processed = 0
+
+        created_ids = {}
+        consignee_instances = {}
+        try:
+            cr = pooler.get_db(dbname).cursor()
+
+            target_cc_ids = self.pool.get('account.target.costcenter').search(cr, uid, [('instance_id.state', '!=', 'inactive'), ('is_po_fo_cost_center', '=', True)], context=context)
+            for target in self.pool.get('account.target.costcenter').browse(cr, uid, target_cc_ids, fields_to_fetch=['cost_center_id', 'instance_id'], context=context):
+                cost_center[target.cost_center_id.code.lower()] = target.cost_center_id.id
+                consignee_instances[target.instance_id.instance.lower()] = target.cost_center_id.id
+
+            wiz = self.browse(cr, uid, wiz_id, context=None)
+            file_data = SpreadsheetXML(xmlstring=base64.decodestring(wiz.file))
+            nb_lines = file_data.getRows()
+
+            line = 0
+            for row in file_data.getRows():
+                line += 1
+                if line == 1:
+                    # header
+                    continue
+                if not len(row.cells):
+                    # empty line
+                    continue
+                processed += 1
+                if len(row.cells) < 7:
+                    manage_error(line, _('a row must have 8 columns'), row)
+                    continue
+
+                if not row.cells[0].data:
+                    manage_error(line, _('Order ref is mandatory'), row)
+                    continue
+
+                po_ref = row.cells[0].data.strip()
+                if not re.match('^[0-9]{2}/[^/]+/\w+/PO\d+$', po_ref):
+                    manage_error(line, _('Order ref %s does not match the PO pattern') % po_ref, row)
+                    continue
+
+                if not row.cells[1].data:
+                    manage_error(line, _('Requestor Cost Center is mandatory'), row)
+                    continue
+
+                cc = row.cells[1].data.strip().lower()
+                if cc not in cost_center:
+                    manage_error(line, _('Requestor Cost Center %s not found or does not match any active instance.') % row.cells[1].data, row)
+                    continue
+                cc_id = cost_center[cc]
+
+                consignee_id = False
+                consignee_instance_txt = False
+                if row.cells[2].data:
+                    cc = row.cells[2].data.strip().lower()
+
+                    if cc in cost_center:
+                        consignee_id = cost_center[cc]
+                        consignee_instance_txt = ''
+                    elif cc in consignee_instances:
+                        consignee_id= consignee_instances[cc]
+                        consignee_instance_txt = row.cells[2].data.strip()
+                    else:
+                        manage_error(line, _('Consignee Cost Center/Instance %s not found or does not match any active instance.') % row.cells[2].data, row)
+                        continue
+
+
+                if not row.cells[3].data:
+                    manage_error(line, _('Product Code is mandatory.'), row)
+                    continue
+                p_code = row.cells[3].data.strip().lower()
+                if p_code not in product_cache:
+                    p_ids = self.pool.get('product.product').search(cr, uid, [('default_code', '=ilike', p_code)], context=context)
+                    product_cache[p_code] = p_ids[0] if p_ids else False
+                if not product_cache[p_code]:
+                    manage_error(line, _('Product Code %s not found.') % (row.cells[3].data,), row)
+                    continue
+
+                if not row.cells[4].data:
+                    manage_error(line, _('Product quantity is mandatory.'), row)
+                    continue
+                try:
+                    qty = float(row.cells[4].data)
+                except:
+                    manage_error(line, _('Product Quantity %s is not a number.') % (row.cells[4].data, ), row)
+                    continue
+
+                if qty <= 0:
+                    manage_error(line, _('Product Quantity %s cannot be 0 or negative') % (row.cells[4].data, ), row)
+                    continue
+
+                if not row.cells[5].data:
+                    manage_error(line, _('Unit Price is mandatory.'), row)
+                    continue
+                try:
+                    unit_price = float(row.cells[5].data)
+                except:
+                    manage_error(line, _('Unit Price %s is not a number.') % (row.cells[5].data, ), row)
+                    continue
+
+                if not row.cells[6].data:
+                    manage_error(line, _('Currency is mandatory.'), row)
+                    continue
+                curr_code = row.cells[6].data.strip().lower()
+                if curr_code not in curr_cache:
+                    curr_ids = self.pool.get('res.currency').search(cr, uid, [('name', '=ilike', curr_code)], context=context)
+                    curr_cache[curr_code] = curr_ids[0] if curr_ids else False
+                if not curr_cache[curr_code]:
+                    manage_error(line, _('Currency %s not found.') % (row.cells[6].data,), row)
+                    continue
+
+                mapping = ''
+                if len(row.cells) > 7 and row.cells[7].data:
+                    mapping = row.cells[7].data.strip()
+
+                cr.execute("SAVEPOINT esc_line")
+                try:
+                    new_line = self.pool.get('esc.invoice.line').create(cr, uid, {
+                        'po_name': po_ref,
+                        'requestor_cc_id': cc_id,
+                        'consignee_cc_id': consignee_id,
+                        'imported_consignee_instance': consignee_instance_txt,
+                        'product_id': product_cache[p_code],
+                        'price_unit': unit_price,
+                        'product_qty': qty,
+                        'currency_id': curr_cache[curr_code],
+                        'shipment_ref': mapping,
+                    }, context=context)
+                    created_ids[new_line] = line
+                    created += 1
+                    cr.execute("RELEASE SAVEPOINT esc_line")
+                except osv.except_osv, e:
+                    cr.execute("ROLLBACK TO SAVEPOINT esc_line")
+                    manage_error(line, e.value, row)
+                except IntegrityError:
+                    cr.execute("ROLLBACK TO SAVEPOINT esc_line")
+                    line_id = False
+
+                    if created_ids:
+                        line_id = self.pool.get('esc.invoice.line').search(cr, uid, [
+                            ('id', 'in', created_ids.keys()),
+                            ('po_name', '=', po_ref),
+                            ('requestor_cc_id', '=', cc_id),
+                            ('consignee_cc_id', '=', consignee_id),
+                            ('product_id', '=', product_cache[p_code]),
+                            ('price_unit', '=', unit_price),
+                            ('product_qty', '=', qty),
+                            ('currency_id', '=', curr_cache[curr_code]),
+                            ('shipment_ref', '=', mapping)
+                        ], context=context)
+                        if line_id:
+                            manage_error(line, _('duplicates line %d') % created_ids[line_id[0]], row)
+                    if not line_id:
+                        manage_error(line, _('Line duplicated in the system'), row)
+
+                if processed%10 == 0:
+                    self.write(cr, uid, wiz_id, {'progress': int(processed/float(nb_lines)*100), 'created': created, 'nberrors': len(errors), 'error': "\n".join(errors)}, context=context)
+
+            state = 'done'
+            if errors:
+                state = 'error'
+                nb_errors = len(errors)
+                errors.insert(0, _('Imported with error(s)'))
+                msg = "\n".join(errors)
+            else:
+                msg = _("International Invoices Lines import successful")
+                nb_errors = 0
+
+            self.write(cr, uid, wiz_id, {'progress': 100, 'state': state, 'created': created, 'total': processed, 'error': msg, 'nberrors': nb_errors, 'end_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'file': False}, context=context)
+
+        except Exception, e:
+            cr.rollback()
+            if isinstance(e, osv.except_osv):
+                error = e.value
+            else:
+                error = e
+            msg = self.read(cr, uid, wiz_id, ['error'])['error'] or ''
+            self.write(cr, uid, wiz_id, {'state': 'error', 'progress': 100, 'error': "%s\n%s\n%s" % (msg, tools.ustr(error), tools.get_traceback(e)), 'end_date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        finally:
+            cr.commit()
+            cr.close(True)
+
+    def done(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'ack'}, context=context)
+        d = self.pool.get('ir.actions.act_window').open_view_from_xmlid(cr, uid, 'account_hq_entries.esc_invoice_line_action', context=context)
+        return d
+
+    def ack(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'ack'}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+esc_line_import_wizard()
+
 
=== added file 'bin/addons/account_hq_entries/wizard/esc_lines_import_view.xml'
--- bin/addons/account_hq_entries/wizard/esc_lines_import_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/account_hq_entries/wizard/esc_lines_import_view.xml	2023-05-05 12:01:38 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="esc_line_import_wizard" model="ir.ui.view">
+            <field name="name">esc.line.import.wizard</field>
+            <field name="model">esc.line.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="International Invoices Lines Import">
+                    <label string="This will import lines from a SpreadSheet xml file." colspan="4"/>
+                    <newline/>
+                    <group colspan="4">
+                        <field name="file" filename="filename" colspan="2"/>
+                        <field name="filename" invisible="1"/>
+                    </group>
+                    <newline />
+                    <button name="get_template_file" type="object"  string="Download Empty Template" icon="gtk-justify-fill" colspan="1"/>
+                    <group colspan="3" />
+                    <newline />
+                    <newline />
+                    <group colspan="4" col="2">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button name="button_validate" type="object" string="Import" icon="terp-camera_test"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="esc_line_import_progress_wizard" model="ir.ui.view">
+            <field name="name">esc.line.import.wizard</field>
+            <field name="model">esc.line.import</field>
+            <field name="priority" eval="100" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="International Invoices Lines Import">
+                    <field name="progress" widget="progressbar" colspan="4"/>
+                    <newline />
+                    <field name="filename" readonly="1" />
+                    <newline />
+                    <field name="state" />
+                    <group colspan="2" col="4">
+                        <field name="start_date" />
+                        <field name="end_date" />
+                    </group>
+                    <html colspan="4">
+                    <script language="javascript">
+                        $(document).ready(function() {
+                            if ($('#state').val() == 'inprogress') {
+                                setTimeout(function(){
+                                    $('#dummy').click();
+                                },2400)
+                            }
+                        });
+                    </script>
+                    </html>
+
+                    <newline />
+                    <field name="created" />
+                    <field name="nberrors" />
+                    <newline />
+                    <group colspan="4" col="4">
+                        <button name="get_error_file" type="object"  string="Download Rejected Lines" icon="gtk-justify-fill" colspan="1" attrs="{'invisible': [('state', '!=', 'error')]}"/>
+                        <group colspan="3" />
+                    </group>
+                    <newline />
+                    <newline />
+                    <field name="error" colspan="4" nolabel="1" />
+                    <group colspan="4" col="4">
+                        <button name="dummy" string="Update" icon="gtk-refresh" invisible="1"/>
+                        <button string="OK" name="done" type="object" icon="gtk-ok" states="done" />
+                        <button string="Reset" name="done" type="object" icon="gtk-ok" states="error" help="Reset import and close the window" />
+                        <button string="Close" special="cancel" icon="gtk-cancel" states="error" help="Keep import results and close the window"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="esc_line_import_action" model="ir.actions.server">
+            <field name="name">International Invoices Lines Import</field>
+            <field name="model_id" ref="model_esc_line_import" />
+            <field name="state">code</field>
+            <field name="code">action = obj.open_wizard(context=context)</field>
+        </record>
+
+        <menuitem name="International Invoices Lines Import" action="esc_line_import_action" type="server" id="esc_line_import_menu" parent="menu_hq" sequence="19"/>
+    </data>
+</openerp>
 
=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2022-05-10 12:24:07 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2023-05-05 12:01:38 +0000
@@ -467,25 +467,79 @@
         uom_obj = self.pool.get('product.uom')
         currency_obj = self.pool.get('res.currency')
         product_obj = self.pool.get('product.product')
+        esc_line_obj = self.pool.get('esc.invoice.line')
+        tc_fin_obj = self.pool.get('finance_price.track_changes')
 
         if context is None:
             context = {}
 
         average_values = {}
 
+        company_currency_id = move.company_id.currency_id.id
+
         if move.price_currency_id:
             move_currency_id = move.price_currency_id.id
         else:
             move_currency_id = move.company_id.currency_id.id
         context['currency_id'] = move_currency_id
 
+
+
+        compute_finance_price = False
+        if self.pool.get('unifield.setup.configuration').get_config(cr, uid, 'esc_line'):
+            compute_finance_price = move.picking_id.partner_id.partner_type == 'esc' or move.dpo_line_id and move.purchase_line_id.from_dpo_esc or False
+
         qty = line.quantity
         if line.uom_id.id != line.product_id.uom_id.id:
             qty = uom_obj._compute_qty(cr, uid, line.uom_id.id, line.quantity, line.product_id.uom_id.id)
 
         product_availability.setdefault(line.product_id.id, line.product_id.qty_available)
-
+        track_finance_price = []
+        tc_fin_ids = []
         if qty > 0.00:
+            if compute_finance_price:
+                esc_dom = [('state','!=', 'done'), ('product_id', '=', line.product_id.id), ('po_name', '=', move.purchase_line_id.order_id.name)]
+                # exact qty
+                esc_ids = esc_line_obj.search(cr, uid, esc_dom + [('remaining_qty', '=', qty)], order='state, id', limit=1, context=context)
+                if not esc_ids:
+                    esc_ids = esc_line_obj.search(cr, uid, esc_dom, order='state, id', context=context)
+
+                remaining_in_qty = qty
+                total_price = 0
+                for esc_line in esc_line_obj.browse(cr, uid, esc_ids, context=context):
+                    if remaining_in_qty <= 0:
+                        break
+                    unit_iil_price = esc_line.price_unit
+                    if esc_line.currency_id.id != company_currency_id:
+                        unit_iil_price = currency_obj.compute(cr, uid, esc_line.currency_id.id, company_currency_id, unit_iil_price, round=False, context=context)
+
+                    if esc_line.remaining_qty - remaining_in_qty >= 0.001:
+                        total_price += unit_iil_price * remaining_in_qty
+
+                        remaining_iil_qty = esc_line.remaining_qty - remaining_in_qty
+                        if abs(remaining_iil_qty) <= 0.001:
+                            esc_line_obj.write(cr, uid, esc_line.id, {'state': 'done', 'remaining_qty': 0}, context=context)
+                        else:
+                            esc_line_obj.write(cr, uid, esc_line.id, {'state': '0_open', 'remaining_qty': remaining_iil_qty}, context=context)
+                        track_finance_price.append({'qty_processed': remaining_in_qty, 'price_unit': unit_iil_price, 'matching_type': 'iil', 'esc_invoice_line_id': esc_line.id})
+                        remaining_in_qty = 0
+
+                    else:
+                        esc_line_obj.write(cr, uid, esc_line.id, {'state': 'done', 'remaining_qty': 0}, context=context)
+                        total_price += unit_iil_price * esc_line.remaining_qty
+                        remaining_in_qty -= esc_line.remaining_qty
+                        track_finance_price.append({'qty_processed': esc_line.remaining_qty, 'price_unit': unit_iil_price, 'matching_type': 'iil', 'esc_invoice_line_id': esc_line.id})
+
+                if remaining_in_qty > 0:
+                    # all IIL used: take PO price
+                    po_price = move.purchase_line_id.price_unit
+                    if move.purchase_line_id.order_id.currency_id.id != company_currency_id:
+                        po_price = currency_obj.compute(cr, uid,  move.purchase_line_id.order_id.currency_id.id, company_currency_id, po_price, round=False, context=context)
+                    total_price += remaining_in_qty * po_price
+                    track_finance_price.append({'qty_processed': remaining_in_qty, 'price_unit': po_price, 'matching_type': 'po', 'purchase_oder_line_id': move.purchase_line_id.id})
+
+
+                # by remaining qty
             new_price = line.cost
             # Recompute unit price if the currency used is not the functional currency
             if line.currency.id != move_currency_id:
@@ -500,19 +554,36 @@
             new_std_price = 0.00
             if line.product_id.qty_available <= 0.00:
                 new_std_price = new_price
+                if compute_finance_price:
+                    new_finance_price = round(total_price / float(qty), 5)
             else:
                 # Get the current price in today's rate
                 current_price = product_obj.price_get(cr, uid, [line.product_id.id], 'standard_price', context=context)[line.product_id.id]
+
                 # Check no division by zero
                 if product_availability[line.product_id.id]:
                     new_std_price = ((current_price * product_availability[line.product_id.id])
                                      + (new_price * qty)) / (product_availability[line.product_id.id] + qty)
 
+                    if compute_finance_price:
+                        # TODO : init finance_price
+                        if not line.product_id.finance_price:
+                            new_finance_price = round(total_price / float(qty), 5)
+                        else:
+                            new_finance_price = round((line.product_id.finance_price *  product_availability[line.product_id.id] + total_price) / (product_availability[line.product_id.id] + qty), 5)
+
             new_std_price = round(currency_obj.compute(cr, uid, line.currency.id, move.company_id.currency_id.id,
                                                        new_std_price, round=False, context=context), 5)
 
             # Write the field according to price type field
-            product_obj.write(cr, uid, [line.product_id.id], {'standard_price': new_std_price})
+            prod_to_write = {'standard_price': new_std_price}
+            if compute_finance_price:
+                prod_to_write['finance_price'] = new_finance_price
+                for tc_fin in track_finance_price:
+                    tc_fin.update({'product_id': line.product_id.id, 'old_price': line.product_id.finance_price, 'new_price': new_finance_price, 'stock_before': product_availability.get(line.product_id.id, 0)})
+                    tc_fin_ids.append(tc_fin_obj.create(cr, uid, tc_fin, context=context))
+            product_obj.write(cr, uid, [line.product_id.id], prod_to_write)
+
             pchanged = False
             # Is price changed ?
             if line.cost and move.purchase_line_id:
@@ -531,7 +602,7 @@
                 'price_currency_id': line.currency.id,
             }
 
-        return average_values, sptc_values
+        return average_values, sptc_values, tc_fin_ids
 
     def _get_values_from_line(self, cr, uid, move, line, db_data, context=None):
         """
@@ -814,7 +885,6 @@
                 out_moves = mirror_data['moves']
                 average_values = {}
                 move_sptc_values = []
-
                 line = False
 
                 if move.purchase_line_id and move.purchase_line_id.id not in po_line_qty:
@@ -828,11 +898,13 @@
 
                     if not values.get('product_qty', 0.00):
                         continue
+
+                    tc_ids = []
                     # Check if we must re-compute the price of the product
                     compute_average = process_avg_sysint and picking_dict['type'] == 'in' and line.product_id.cost_method == 'average'
 
                     if compute_average:
-                        average_values, sptc_values = self._compute_average_values(cr, uid, move, line, product_availability, context=context)
+                        average_values, sptc_values, tc_ids = self._compute_average_values(cr, uid, move, line, product_availability, context=context)
                         values.update(average_values)
                         move_sptc_values.append(sptc_values)
 
@@ -856,6 +928,9 @@
                         context['keepLineNumber'] = False
                         done_moves.append(new_move_id)
 
+                    if tc_ids:
+                        self.pool.get('finance_price.track_changes').write(cr, uid, tc_ids, {'stock_move_id': done_moves[-1]}, context=context)
+
                     values['processed_stock_move'] = False
 
                     out_values = values.copy()
 
=== modified file 'bin/addons/msf_audittrail/data/audittrail_hq_entry.yml'
--- bin/addons/msf_audittrail/data/audittrail_hq_entry.yml	2021-05-05 16:04:38 +0000
+++ bin/addons/msf_audittrail/data/audittrail_hq_entry.yml	2023-05-05 12:01:38 +0000
@@ -26,3 +26,31 @@
             self.write(cr, uid, rule_id, vals, context=context)
         # Subscribe to the rule
         self.subscribe(cr, uid, rule_id)
+
+-
+  For International Invoice Lines
+-
+  !python {model: audittrail.rule}: |
+    name = 'International Invoice Lines'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'esc.invoice.line')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        # Create the rule
+        fields = ['state']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'esc.invoice.line'), ('name', 'in', fields)], context=context)
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
 
=== modified file 'bin/addons/msf_printed_documents/printed_report.xml'
--- bin/addons/msf_printed_documents/printed_report.xml	2020-09-18 14:39:47 +0000
+++ bin/addons/msf_printed_documents/printed_report.xml	2023-05-05 12:01:38 +0000
@@ -30,6 +30,7 @@
             header="False"
             auto="False"
             menu="True"
+            sequence="150"
         />
 
         <report
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2023-05-03 10:23:38 +0000
+++ bin/addons/msf_profile/data/patches.xml	2023-05-05 12:01:38 +0000
@@ -901,6 +901,7 @@
         <record id="us_11195_oca_period_nr" model="patch.scripts">
             <field name="method">us_11195_oca_period_nr</field>
         </record>
+<<<<<<< TREE
 
         <!-- UF29.0 -->
         <record id="us_11177_bn_for_kcl_items" model="patch.scripts">
@@ -933,5 +934,11 @@
         <record id="us_10885_tc_entries" model="patch.scripts">
             <field name="method">us_10885_tc_entries</field>
         </record>
+=======
+
+        <record id="us_10835_disable_iil_menu" model="patch.scripts">
+            <field name="method">us_10835_disable_iil_menu</field>
+        </record>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2023-05-04 12:17:53 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-05-05 12:01:38 +0000
@@ -305,7 +305,7 @@
 msgid "Instance code / Place of payment"
 msgstr "Code de l'Instance / Lieu du paiement"
 
-#. modules: account, register_accounting, account_mcdb, sale, base,useability_dashboard_and_menu
+#. modules: account, register_accounting, account_mcdb, sale, base,useability_dashboard_and_menu, account_hq_entries
 #: selection:account.period,state:0
 #: selection:account.fiscalyear.state,state:0
 #: selection:account.period.state,state:0
@@ -314,7 +314,11 @@
 #: view:signature.follow_up:0
 #: selection:signature.follow_up,doc_state:0
 #: selection:signature.follow_up,status:0
+<<<<<<< TREE
 #: code:addons/useability_dashboard_and_menu/report/signature_follow_up_search_report.py:74
+=======
+#: selection:esc.invoice.line,state:0
+>>>>>>> MERGE-SOURCE
 msgid "Open"
 msgstr "Ouverte"
 
@@ -8314,7 +8318,7 @@
 msgid "Generate discrepancies"
 msgstr "Générer les écarts"
 
-#. modules: purchase, account, msf_outgoing, finance, purchase_override, procurement, procurement_request, tender_flow, product, specific_rules, kit, stock_forecast, analytic, stock_batch_recall, register_accounting, stock_override, msf_supply_doc_export, mission_stock, msf_doc_import, sale, stock, account_override
+#. modules: purchase, account, msf_outgoing, finance, purchase_override, procurement, procurement_request, tender_flow, product, specific_rules, kit, stock_forecast, analytic, stock_batch_recall, register_accounting, stock_override, msf_supply_doc_export, mission_stock, msf_doc_import, sale, stock, account_override, account_hq_entries
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -8412,10 +8416,14 @@
 #: field:view.expired.expiring.stock.lines,product_qty:0
 #: code:addons/msf_doc_import/report/return_from_unit_export.py:120
 #: field:account.analytic.line,entry_quantity:0
+<<<<<<< TREE
 #: report:loan.certificate:0
 #: report:loan.return.certificate:0
 #: report:ship.loan.certificate:0
 #: report:ship.loan.return.certificate:0
+=======
+#: field:esc.invoice.line,product_qty:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Quantity"
 msgstr "Quantité"
@@ -8702,6 +8710,8 @@
 #: selection:signature.follow_up,doc_state:0
 #: selection:hq.entries.import,state:0
 #: view:physical.inventory:0
+#: selection:esc.invoice.line,state:0
+#: selection:esc.line.import,state:0
 #, python-format
 msgid "Draft"
 msgstr "Brouillon"
@@ -8784,6 +8794,7 @@
 #: field:wizard.register.import,filename:0
 #: field:account.invoice.import,filename:0
 #: field:account.cv.import,filename:0
+#: field:esc.line.import,filename:0
 msgid "Imported filename"
 msgstr "Nom du fichier importé"
 
@@ -9632,7 +9643,7 @@
 msgid "Go to tender form"
 msgstr "Aller sur Formulaire Appels d'Offres"
 
-#. modules: account, base_setup, purchase_double_validation, msf_instance, sale, msf_config_locations, base, msf_button_access_rights, unifield_setup
+#. modules: account, base_setup, purchase_double_validation, msf_instance, sale, msf_config_locations, base, msf_button_access_rights, unifield_setup, account_hq_entries
 #: view:wizard.multi.charts.accounts:0
 #: view:res.config:0
 #: view:res.config.users:0
@@ -9657,6 +9668,7 @@
 #: view:customer.commitment.setup:0
 #: view:previous.fy.dates.setup:0
 #: view:signature.setup:0
+#: view:esc_line.setup:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
@@ -16305,6 +16317,7 @@
 #: view:sync.version.instance.monitor:0
 #: view:automated.export:0
 #: view:automated.import:0
+#: view:esc.invoice.line:0
 msgid "Group By..."
 msgstr "Grouper Par..."
 
@@ -20083,6 +20096,7 @@
 #: field:account.invoice.import,progression:0
 #: field:hq.entries.import,progress:0
 #: field:account.cv.import,progression:0
+#: field:esc.line.import,progress:0
 msgid "Progression"
 msgstr "Progression"
 
@@ -20948,6 +20962,9 @@
 #: selection:wizard.import.ad.line,state:0
 #: selection:hq.entries.import,state:0
 #: selection:account.cv.import,state:0
+#: view:esc.invoice.line:0
+#: selection:esc.invoice.line,state:0
+#: selection:esc.line.import,state:0
 msgid "Done"
 msgstr "Clôturé"
 
@@ -23178,6 +23195,7 @@
 #: view:replenishment.segment.line:0
 #: view:replenishment.consolidated_oc.import:0
 #: view:hq.entries.import:0
+#: view:esc.line.import:0
 msgid "Close"
 msgstr "Fermé"
 
@@ -24753,7 +24771,11 @@
 msgid "Phase Out products"
 msgstr "Produits Supprimés"
 
+<<<<<<< TREE
 #. modules: tender_flow, product_asset, update_client, register_accounting, return_claim, msf_doc_import, supplier_catalogue, purchase_compare_rfq, product_list, stock, reason_types_moves, stock_override, purchase_override, specific_rules, kit, base, msf_tools, sales_followup, account, msf_outgoing, order_nomenclature, msf_field_access_rights, sale, msf_button_access_rights, analytic_distribution, msf_supply_doc_export, consumption_calculation, procurement_request, purchase_allocation_report
+=======
+#. modules: tender_flow, product_asset, update_client, register_accounting, return_claim, msf_doc_import, supplier_catalogue, purchase_compare_rfq, product_list, stock, reason_types_moves, stock_override, purchase_override, specific_rules, kit, base, msf_tools, sales_followup, account, msf_outgoing, order_nomenclature, msf_field_access_rights, sale, msf_button_access_rights, analytic_distribution, msf_supply_doc_export, consumption_calculation, procurement_request, account_hq_entries
+>>>>>>> MERGE-SOURCE
 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:153
 #: field:account.move.line.reconcile.writeoff,comment:0
 #: field:account.commitment,notes:0
@@ -24858,10 +24880,14 @@
 #: code:addons/msf_doc_import/report/return_from_unit_export.py:124
 #: code:addons/stock/report/closed_physical_inventory_report.py:134
 #: code:addons/msf_doc_import/wizard/__init__.py:57
+<<<<<<< TREE
 #: report:addons/purchase_allocation_report/report/po_allocation_report.mako:244
 #: report:addons/purchase_allocation_report/report/po_line_allocation_report.mako:198
 #: report:po.line.allocation.report:0
 #: report:shipment.donation.certificate:0
+=======
+#: field:finance_price.track_changes,comment:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Comment"
 msgstr "Commentaire"
@@ -24961,10 +24987,11 @@
 msgid "Social IDs"
 msgstr "Identité Sociale"
 
-#. modules: account, register_accounting, product_attributes
+#. modules: account, register_accounting, product_attributes, account_hq_entries
 #: view:account.bank.statement:0
 #: view:account.bank.statement:0
 #: report:addons/product_attributes/report/standard_price_track_changes.mako:101
+#: code:addons/account_hq_entries/report/finance_cost_price.py:72
 msgid "Transaction"
 msgstr "Transactions"
 
@@ -26226,8 +26253,9 @@
 msgid "Only products with total expired > 0"
 msgstr "Seuls produits ayant un total d'articles expirés > 0"
 
-#. module: product
+#. module: product, account_hq_entries
 #: field:product.template,loc_row:0
+#: field:esc.line.import.rejected,xls_row:0
 msgid "Row"
 msgstr "Ligne"
 
@@ -37409,7 +37437,7 @@
 msgid "On Multiple Doc."
 msgstr "Sur Plusieurs Documents"
 
-#. modules: tender_flow, financing_contract, product_asset, account_corrections, product_attributes, msf_accrual, analytic_override, sync_client, account_mcdb, res_currency_tables, procurement_request, stock_forecast, board, stock_override, msf_doc_import, stock, finance, msf_homere_interface, base, kit, stock_schedule, account, msf_outgoing, resource, msf_audittrail, stock_move_tracking, msf_supply_doc_export, procurement_cycle, msf_order_date
+#. modules: tender_flow, financing_contract, product_asset, account_corrections, product_attributes, msf_accrual, analytic_override, sync_client, account_mcdb, res_currency_tables, procurement_request, stock_forecast, board, stock_override, msf_doc_import, stock, finance, msf_homere_interface, base, kit, stock_schedule, account, msf_outgoing, resource, msf_audittrail, stock_move_tracking, msf_supply_doc_export, procurement_cycle, msf_order_date, account_hq_entries
 #: selection:account.aged.trial.balance,filter:0
 #: report:account.analytic.account.journal:0
 #: field:account.bank.statement,date:0
@@ -37535,6 +37563,7 @@
 #: report:addons/account/report/account_employee_ledger.mako:297
 #: selection:wizard.account.employee.balance.tree,filter:0
 #: field:signature.line,date:0
+#: field:finance_price.track_changes,date:0
 #, python-format
 msgid "Date"
 msgstr "Date"
@@ -40501,7 +40530,7 @@
 msgid "From confirmed to assigned."
 msgstr "De confirmé à attribué."
 
-#. modules: tender_flow, account_override, purchase_allocation_report, procurement_cycle, return_claim, supplier_catalogue, mission_stock, stock_override, purchase_compare_rfq, purchase_followup, msf_supply_doc_export, analytic_distribution, product, procurement_request, consumption_calculation, specific_rules, kit, msf_doc_import, procurement_report, sales_followup, account, msf_outgoing, product_attributes, sale, sourcing, stock, stock_batch_recall,msf_tools
+#. modules: tender_flow, account_override, purchase_allocation_report, procurement_cycle, return_claim, supplier_catalogue, mission_stock, stock_override, purchase_compare_rfq, purchase_followup, msf_supply_doc_export, analytic_distribution, product, procurement_request, consumption_calculation, specific_rules, kit, msf_doc_import, procurement_report, sales_followup, account, msf_outgoing, product_attributes, sale, sourcing, stock, stock_batch_recall,msf_tools, account_hq_entries
 #: field:account.analytic.line,product_uom_id:0
 #: selection:account.journal.column,field:0
 #: field:account.move.line,product_uom_id:0
@@ -40650,6 +40679,7 @@
 #: code:addons/stock/report/closed_physical_inventory_report.py:124
 #: field:stock.pipe.per.product.instance.prod.lines,uom_id:0
 #: field:report.batch.recall,uom_id:0
+#: field:esc.invoice.line,uom_id:0
 #, python-format
 msgid "UoM"
 msgstr "UdM"
@@ -42310,6 +42340,7 @@
 #: view:account.invoice.import:0
 #: view:hq.entries.import:0
 #: view:account.cv.import:0
+#: view:esc.line.import:0
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -43761,7 +43792,7 @@
 msgid "product code"
 msgstr "code produit"
 
-#. modules: account, analytic_distribution_supply, finance, register_accounting, account_override, msf_audittrail, analytic_distribution
+#. modules: account, analytic_distribution_supply, finance, register_accounting, account_override, msf_audittrail, analytic_distribution, account_hq_entries
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
@@ -43775,6 +43806,7 @@
 #: model:ir.model,name:finance.model_account_invoice_line
 #: model:ir.model,name:msf_audittrail.model_account_invoice_line
 #: model:ir.model,name:register_accounting.model_wizard_account_invoice_line
+#: field:finance_price.track_changes,invoice_line_id:0
 msgid "Invoice Line"
 msgstr "Ligne de Facture"
 
@@ -44976,6 +45008,7 @@
 #: field:signature.export.wizard,end_date:0
 #: field:hq.entries.import,end_date:0
 #: field:signature.image,to_date:0
+#: field:esc.line.import,end_date:0
 msgid "End Date"
 msgstr "Date de Clôture"
 
@@ -45389,6 +45422,7 @@
 #. module: msf_homere_interface, account_hq_entries
 #: field:hr.payroll.import.confirmation,total:0
 #: field:hq.entries.import,created:0
+#: field:esc.line.import,created:0
 msgid "Processed"
 msgstr "Traité"
 
@@ -45491,7 +45525,7 @@
 msgid "The currency you want to %s is used in at least one Commitment Voucher which isn't Done."
 msgstr "La devise que vous désirez %s est utilisée dans au moins un Bon d'Engagement non Terminé."
 
-#. modules: account, resource, account_mcdb, msf_instance, analytic, base, msf_audittrail, msf_profile, product_attributes, sync_client, useability_dashboard_and_menu
+#. modules: account, resource, account_mcdb, msf_instance, analytic, base, msf_audittrail, msf_profile, product_attributes, sync_client, useability_dashboard_and_menu, account_hq_entries
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -45529,8 +45563,13 @@
 #: field:signature.users.allowed,user_id:0
 #: field:signature.follow_up,user_id:0
 #: field:signature.set_user,user_name:0
+<<<<<<< TREE
 #: code:addons/useability_dashboard_and_menu/report/signature_follow_up_search_report.py:204
 #: report:signature.follow_up.search.pdf:0
+=======
+#: code:addons/account_hq_entries/report/finance_cost_price.py:69
+#: field:finance_price.track_changes,user_id:0
+>>>>>>> MERGE-SOURCE
 msgid "User"
 msgstr "Utilisateur"
 
@@ -48028,7 +48067,7 @@
 msgid "Child IDs"
 msgstr "ID Enfants"
 
-#. modules: purchase, account, finance, account_mcdb, sale, specific_rules, account_override, delete_button, tender_flow, analytic_distribution, msf_budget, register_accounting, msf_accrual, kit, stock
+#. modules: purchase, account, finance, account_mcdb, sale, specific_rules, account_override, delete_button, tender_flow, analytic_distribution, msf_budget, register_accounting, msf_accrual, kit, stock, account_hq_entries
 #: view:account.common.report:0
 #: view:account.mcdb:0
 #: view:account.chart:0
@@ -48052,6 +48091,7 @@
 #: view:free.allocation.wizard:0
 #: view:account.commitment.line:0
 #: view:view.expired.expiring.stock:0
+#: view:esc.invoice.line:0
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -48071,7 +48111,7 @@
 msgid "TVA :"
 msgstr "TVA :"
 
-#. modules: sourcing, sale, product_attributes, procurement_cycle, finance
+#. modules: sourcing, sale, product_attributes, procurement_cycle, finance, account_hq_entries
 #: field:sale.report,product_code:0
 #: field:sale.order.line,product_code:0
 #: report:addons/product_attributes/report/standard_price_track_changes.mako:69
@@ -48079,7 +48119,11 @@
 #: report:addons/procurement_cycle/report_doc/replenishment_product_list.mako:124
 #: report:addons/procurement_cycle/report_doc/replenishment_segment.mako:368
 #: report:addons/finance/report/fo_follow_up_finance_xls.mako:352
+<<<<<<< TREE
 #: code:addons/procurement_cycle/replenishment.py:3640
+=======
+#: code:addons/account_hq_entries/report/finance_cost_price.py:51
+>>>>>>> MERGE-SOURCE
 msgid "Product code"
 msgstr "Code Produit"
 
@@ -49926,8 +49970,9 @@
 msgid "Email"
 msgstr "Courriel"
 
-#. module: base
+#. module: base, account_hq_entries
 #: field:workflow.triggers,instance_id:0
+#: field:esc.invoice.line,dest_instance_id:0
 msgid "Destination Instance"
 msgstr "Instance de Destination"
 
@@ -53493,7 +53538,7 @@
 msgid "Ignore Exception"
 msgstr "Ignorer l'Exception"
 
-#. modules: account, finance, msf_instance, register_accounting, sale, base, msf_tools, mission_stock, sync_client, procurement_cycle, stock
+#. modules: account, finance, msf_instance, register_accounting, sale, base, msf_tools, mission_stock, sync_client, procurement_cycle, stock, account_hq_entries
 #: view:account.bank.statement:0
 #: report:addons/account/report/account_liquidity_balance.mako:156
 #: field:workflow.workitem,inst_id:0
@@ -53528,6 +53573,7 @@
 #: report:liquidity.position.pdf:0
 #: field:stock.location.instance,instance_id:0
 #: report:signature.export.report:0
+#: code:addons/account_hq_entries/report/finance_cost_price.py:47
 msgid "Instance"
 msgstr "Instance"
 
@@ -56717,7 +56763,7 @@
 msgid "Operational advance linked po invoices"
 msgstr "Operational advance linked po invoices"
 
-#. modules: purchase, account, base_setup, hr, purchase_double_validation, msf_instance, sale, msf_config_locations, base, base_report_designer, unifield_setup, msf_button_access_rights
+#. modules: purchase, account, base_setup, hr, purchase_double_validation, msf_instance, sale, msf_config_locations, base, base_report_designer, unifield_setup, msf_button_access_rights, account_hq_entries
 #: field:account.installer,progress:0
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
@@ -56753,6 +56799,7 @@
 #: field:customer.commitment.setup,progress:0
 #: field:previous.fy.dates.setup,progress:0
 #: field:signature.setup,progress:0
+#: field:esc_line.setup,progress:0
 msgid "Configuration Progress"
 msgstr "Progression de la Configuration"
 
@@ -57884,10 +57931,12 @@
 msgid "Invoice Based on Sales Orders"
 msgstr "Facture Basée sur commandes terrains"
 
-#. module: transport_mgmt, msf_supply_doc_export
+#. module: transport_mgmt, msf_supply_doc_export, account_hq_entries
 #: field:international.transport.cost.report,order_id:0
 #: field:local.transport.cost.report,order_id:0
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:229
+#: view:esc.invoice.line:0
+#: field:esc.invoice.line,po_name:0
 msgid "PO Reference"
 msgstr "Référence BC"
 
@@ -57903,12 +57952,16 @@
 msgid "Import Intl Commitments"
 msgstr "Import des Engagements"
 
-#. module: msf_supply_doc_export, register_accounting, stock_override, useability_dashboard_and_menu
+#. module: msf_supply_doc_export, register_accounting, stock_override, useability_dashboard_and_menu, account_hq_entries
 #: report:po.follow.up_rml:0
 #: report:addons/register_accounting/report/fully_report_xls.mako:566
 #: report:addons/stock_override/report/report_stock_move_xls.mako:140
 #: selection:signature.follow_up,doc_type:0
+<<<<<<< TREE
 #: code:addons/useability_dashboard_and_menu/report/signature_follow_up_search_report.py:39
+=======
+#: field:finance_price.track_changes,stock_picking_id:0
+>>>>>>> MERGE-SOURCE
 msgid "IN"
 msgstr "ENTRANT"
 
@@ -60526,7 +60579,7 @@
 msgid "Pallet"
 msgstr "Palette"
 
-#. modules: msf_outgoing, account_mcdb, stock_override, sale, specific_rules, account_override, sourcing, update_client, stock, analytic_distribution, sync_client, resource, finance, account_mcdb, sales_followup, account, procurement_request, hr, consumption_calculation, account_override, base, purchase_followup, sync_client
+#. modules: msf_outgoing, account_mcdb, stock_override, sale, specific_rules, account_override, sourcing, update_client, stock, analytic_distribution, sync_client, resource, finance, account_mcdb, sales_followup, account, procurement_request, hr, consumption_calculation, account_override, base, purchase_followup, sync_client, product
 #: field:output.currency.for.export,state:0
 #: field:account.move,register_line_id:0
 #: field:res.partner,by_invoice_type:0
@@ -60590,6 +60643,7 @@
 #: field:wizard.account.employee.balance.tree,display_load_button:0
 #: field:signature.add_user.wizard,signature_id:0
 #: field:signature.document.wizard,user_id:0
+#: field:product.template,finance_price_currency_id:0
 msgid "unknown"
 msgstr "inconnu"
 
@@ -68707,12 +68761,13 @@
 msgid "Supplier Information"
 msgstr "Fournisseur - Informations"
 
-#. module: msf_outgoing
+#. module: msf_outgoing, account_hq_entries
 #: view:ppl.processor:0
 #: view:stock.incoming.processor:0
 #: view:internal.picking.processor:0
 #: view:outgoing.delivery.processor:0
 #: view:stock.picking:0
+#: view:esc.line.import:0
 msgid "Reset"
 msgstr "RÀZ"
 
@@ -74064,6 +74119,8 @@
 #: field:hq.entries.import,error:0
 #: selection:hq.entries.import,state:0
 #: selection:account.cv.import,state:0
+#: field:esc.line.import,error:0
+#: selection:esc.line.import,state:0
 #, python-format, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -74519,6 +74576,7 @@
 #: field:account.invoice.import,error_ids:0
 #: field:hq.entries.import,nberrors:0
 #: field:account.cv.import,error_ids:0
+#: field:esc.line.import,nberrors:0
 #, python-format
 msgid "Errors"
 msgstr "Erreurs"
@@ -74637,7 +74695,7 @@
 msgid "Line %s :: The move is not 'Available'. Check the state of the stock move and re-try."
 msgstr "Ligne %s :: Le mouvement n'est pas  'Disponible'. Vérifier le statut du mouvement de Stock et ré-essayez."
 
-#. modules: purchase, account, msf_outgoing, analytic_distribution_supply, finance, product_asset, account_override, base, msf_audittrail, register_accounting, analytic_distribution
+#. modules: purchase, account, msf_outgoing, analytic_distribution_supply, finance, product_asset, account_override, base, msf_audittrail, register_accounting, analytic_distribution, account_hq_entries
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: report:account.invoice2:0
@@ -74670,6 +74728,8 @@
 #: view:account.direct.invoice.wizard:0
 #: field:account.invoice.import,invoice_id:0
 #: field:account.cv.import,invoice_id:0
+#: field:finance_price.track_changes,invoice_id:0
+#: selection:finance_price.track_changes,matching_type:0
 msgid "Invoice"
 msgstr "Facture"
 
@@ -75223,6 +75283,7 @@
 #: field:signature.export.wizard,start_date:0
 #: field:hq.entries.import,start_date:0
 #: field:signature.image,from_date:0
+#: field:esc.line.import,start_date:0
 msgid "Start Date"
 msgstr "Date de Début"
 
@@ -76460,7 +76521,7 @@
 msgid "Canada/Yukon"
 msgstr "Canada/Yukon"
 
-#. modules: purchase_allocation_report, unifield_setup, sales_followup, msf_doc_import, purchase, account, useability_dashboard_and_menu
+#. modules: purchase_allocation_report, unifield_setup, sales_followup, msf_doc_import, purchase, account, useability_dashboard_and_menu, account_hq_entries
 #: report:addons/purchase_allocation_report/report/po_line_allocation_report.mako:147
 #: report:purchase.order.allocation.report:0
 #: field:purchase.order.line.allocation.report,order_id:0
@@ -76471,7 +76532,11 @@
 #: code:addons/msf_doc_import/wizard/wizard_import_ad_line.py:122
 #: field:account.invoice.tax,purchase_id:0
 #: selection:signature.follow_up,doc_type:0
+<<<<<<< TREE
 #: code:addons/useability_dashboard_and_menu/report/signature_follow_up_search_report.py:32
+=======
+#: selection:finance_price.track_changes,matching_type:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "PO"
 msgstr "BC"
@@ -77019,7 +77084,7 @@
 msgid "# of lines imported"
 msgstr "# de lignes importées"
 
-#. modules: purchase, account, msf_outgoing, finance, purchase_override, sales_followup, supplier_catalogue, sale, product, kit, account_override, purchase_allocation_report, order_types, tender_flow, msf_supply_doc_export, msf_doc_import, register_accounting, stock, purchase_followup, consumption_calculation, procurement_request
+#. modules: purchase, account, msf_outgoing, finance, purchase_override, sales_followup, supplier_catalogue, sale, product, kit, account_override, purchase_allocation_report, order_types, tender_flow, msf_supply_doc_export, msf_doc_import, register_accounting, stock, purchase_followup, consumption_calculation, procurement_request, account_hq_entries
 #: field:account.invoice.line,price_unit:0
 #: report:account.invoice2:0
 #: report:allocation.invoices.report:0
@@ -77079,7 +77144,12 @@
 #: report:addons/msf_supply_doc_export/report/report_tender_xls.mako:73
 #: code:addons/msf_doc_import/wizard/__init__.py:92
 #: field:tender.line,price_unit:0
+<<<<<<< TREE
 #: report:shipment.donation.certificate:0
+=======
+#: field:esc.invoice.line,price_unit:0
+#: field:finance_price.track_changes,price_unit:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Unit Price"
 msgstr "Prix Unitaire"
@@ -79795,7 +79865,13 @@
 msgid "Date cancel"
 msgstr "Date d'annulation"
 
+<<<<<<< TREE
 #. modules: sales_followup, msf_outgoing, procurement_request, consumption_calculation, sale, purchase_allocation_report, msf_supply_doc_export
+=======
+#. modules: sales_followup, consumption_calculation, procurement_request, msf_supply_doc_export, sale, msf_outgoing, account_hq_entries
+#: view:sale.order:0
+#: field:sale.order,requestor:0
+>>>>>>> MERGE-SOURCE
 #: field:product.history.consumption,requestor_id:0
 #: field:product.likely.expire.report,requestor_id:0
 #: field:weekly.forecast.report,requestor_id:0
@@ -79811,7 +79887,12 @@
 #: field:purchase.order.line.allocation.report,requestor:0
 #: field:internal.request.import,imp_requestor:0
 #: field:internal.request.import,in_requestor:0
+<<<<<<< TREE
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:313
+=======
+#: field:stock.picking,requestor:0
+#: view:esc.invoice.line:0
+>>>>>>> MERGE-SOURCE
 msgid "Requestor"
 msgstr "Demandeur"
 
@@ -81637,6 +81718,8 @@
 #: view:replenishment.consolidated_oc.import:0
 #: view:wizard.import.ad.line:0
 #: view:account.cv.import:0
+#: view:esc.line.import:0
+#: field:esc.line.import.rejected,wiz_id:0
 msgid "Import"
 msgstr "Importer"
 
@@ -82345,6 +82428,8 @@
 #: field:msf.accrual.line,state:0
 #: field:hq.entries.import,state:0
 #: field:account.cv.import,state:0
+#: field:esc.invoice.line,state:0
+#: field:esc.line.import,state:0
 #, python-format
 msgid "State"
 msgstr "Statut"
@@ -83091,7 +83176,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, analytic_distribution
+#. 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, account_hq_entries
 #: field:account.analytic.line,product_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,product_id:0
@@ -83299,6 +83384,9 @@
 #: field:account.commitment.line,line_product_id:0
 #: field:product.ed_bn.mass.update.history,product_id:0
 #: field:stock.picking,product_id:0
+#: view:esc.invoice.line:0
+#: field:esc.invoice.line,product_id:0
+#: field:finance_price.track_changes,product_id:0
 #, python-format
 msgid "Product"
 msgstr "Produit"
@@ -83557,6 +83645,7 @@
 #: field:wizard.register.import,file:0
 #: field:account.invoice.import,file:0
 #: field:account.cv.import,file:0
+#: field:esc.line.import,file:0
 msgid "File"
 msgstr "Fichier"
 
@@ -92376,6 +92465,7 @@
 #: report:addons/msf_outgoing/report/freight_manifest_xls.mako:372
 #: report:freight_manifest:0
 #: field:hq.entries.import,total:0
+#: field:esc.line.import,total:0
 #, python-format
 msgid "Total"
 msgstr "Total"
@@ -93399,7 +93489,7 @@
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#. modules: tender_flow, financing_contract, account_override, product_attributes, msf_accrual, msf_doc_import, finance, base_setup, account_mcdb, res_currency_tables, supplier_catalogue, stock_override, product_asset, analytic_override, purchase_compare_rfq, msf_supply_doc_export, analytic_distribution, product, msf_homere_interface, msf_instance, register_accounting, specific_rules, kit, base, msf_currency_revaluation, account_subscription, return_claim, res_currency_functional, msf_budget, purchase, account, msf_outgoing, msf_partner, purchase_allocation_report, sale, transport_mgmt, stock, sync_so, purchase_followup, consumption_calculation, procurement_request, order_types, purchase_override
+#. modules: tender_flow, financing_contract, account_override, product_attributes, msf_accrual, msf_doc_import, finance, base_setup, account_mcdb, res_currency_tables, supplier_catalogue, stock_override, product_asset, analytic_override, purchase_compare_rfq, msf_supply_doc_export, analytic_distribution, product, msf_homere_interface, msf_instance, register_accounting, specific_rules, kit, base, msf_currency_revaluation, account_subscription, return_claim, res_currency_functional, msf_budget, purchase, account, msf_outgoing, msf_partner, purchase_allocation_report, sale, transport_mgmt, stock, sync_so, purchase_followup, consumption_calculation, procurement_request, order_types, purchase_override, account_hq_entries
 #: view:account.account:0
 #: report:account.analytic.account.journal:0
 #: view:account.analytic.line:0
@@ -93589,7 +93679,11 @@
 #: report:addons/account/report/account_employee_ledger.mako:315
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:345
 #: report:addons/account/report/export_cv.mako:117
+<<<<<<< TREE
 #: report:shipment.donation.certificate:0
+=======
+#: field:esc.invoice.line,currency_id:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Currency"
 msgstr "Devise"
@@ -96551,6 +96645,7 @@
 #: report:account.invoice2:0
 #: code:addons/account_override/res_company.py:40
 #: report:addons/account/report/export_invoice.mako:104
+#: field:hq.entries.split,document_date:0
 #, python-format
 msgid "Document Date"
 msgstr "Date du Document"
@@ -97277,7 +97372,11 @@
 #: view:signature.set_user:0
 #: view:account.cv.import:0
 #: view:split.composition.item.wizard:0
+<<<<<<< TREE
 #: view:signature.follow_up.search.wizard:0
+=======
+#: view:esc.line.import:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -97928,7 +98027,7 @@
 msgid "Removal date"
 msgstr "Date de Retrait"
 
-#. modules: msf_budget, sync_client, res_currency_tables, financing_contract, msf_homere_interface, msf_instance, export_import_lang, msf_outgoing, msf_doc_import, product_attributes
+#. modules: msf_budget, sync_client, res_currency_tables, financing_contract, msf_homere_interface, msf_instance, export_import_lang, msf_outgoing, msf_doc_import, product_attributes, account_hq_entries
 #: view:base.language.export:0
 #: view:base.language.import:0
 #: view:msf.language.import:0
@@ -97942,6 +98041,7 @@
 #: view:ppl.set_pack_on_lines:0
 #: code:addons/msf_doc_import/purchase_order.py:61
 #: view:product.ask.activate.wizard:0
+#: view:esc.line.import:0
 #, python-format
 msgid "OK"
 msgstr "OK"
@@ -98423,7 +98523,7 @@
 msgid "To"
 msgstr "À"
 
-#. modules: delivery_mechanism, account, msf_outgoing, msf_homere_interface, sync_client, stock_override, kit, account_override, register_accounting, msf_doc_import, return_claim, stock
+#. modules: delivery_mechanism, account, msf_outgoing, msf_homere_interface, sync_client, stock_override, kit, account_override, register_accounting, msf_doc_import, return_claim, stock, account_hq_entries
 #: view:account.automatic.reconcile:0
 #: view:account.use.model:0
 #: view:debit.note.import.invoice:0
@@ -98482,6 +98582,7 @@
 #: view:wizard.common.import.line:0
 #: selection:stock.move.in.processor,sequence_issue:0
 #: view:account.cv.import:0
+#: view:hq.entries.import:0
 msgid "Ok"
 msgstr "Ok"
 
@@ -99471,11 +99572,12 @@
 "        This module aims at set documents to 'Done' state.\n"
 "    "
 
-#. modules: procurement, resource, stock
+#. modules: procurement, resource, stock, account_hq_entries
 #: view:procurement.order:0
 #: field:procurement.order,name:0
 #: view:resource.calendar.leaves:0
 #: view:stock.move:0
+#: field:esc.line.import.rejected,error:0
 msgid "Reason"
 msgstr "Motif"
 
@@ -100058,7 +100160,7 @@
 msgid "Monthly review consumption line"
 msgstr "Ligne de Révision Mensuelle des Consommations"
 
-#. modules: purchase, account, base_setup, hr, import_data, msf_instance, sale, msf_config_locations, export_import_lang, base, base_report_designer, unifield_setup, report_webkit, purchase_double_validation, msf_button_access_rights
+#. modules: purchase, account, base_setup, hr, import_data, msf_instance, sale, msf_config_locations, export_import_lang, base, base_report_designer, unifield_setup, report_webkit, purchase_double_validation, msf_button_access_rights, account_hq_entries
 #: field:account.installer,config_logo:0
 #: field:account.installer.modules,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
@@ -100113,6 +100215,7 @@
 #: field:signature.image,pngb64:0
 #: field:signature.line,image_id:0
 #: field:signature.setup,config_logo:0
+#: field:esc_line.setup,config_logo:0
 msgid "Image"
 msgstr "Image"
 
@@ -103726,12 +103829,13 @@
 msgstr " Import en cours... \n"
 " Veuillez attendre que l'import soit terminer avant de faire des modifications."
 
-#. modules: msf_doc_import, msf_outgoing, msf_printed_documents
+#. modules: msf_doc_import, msf_outgoing, msf_printed_documents, account_hq_entries
 #: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:71
 #: report:addons/msf_outgoing/report/pre_packing_excel_report_xls.mako:192
 #: view:shipment:0
 #: report:addons/msf_outgoing/report/freight_manifest_xls.mako:238
 #: report:freight_manifest:0
+#: view:esc.invoice.line:0
 #, python-format
 msgid "Consignee"
 msgstr "Destinataire"
@@ -105612,8 +105716,9 @@
 msgid "Processing Qty can't be larger than move qty."
 msgstr "La qté à traiter ne peut être plus grande que la qté du mouvement."
 
-#. module: stock
+#. module: stock, account_hq_entries
 #: field:stock.move,qty_processed:0
+#: code:addons/account_hq_entries/report/finance_cost_price.py:74
 msgid "Qty Processed"
 msgstr "Qté Taitée"
 
@@ -108523,9 +108628,10 @@
 msgid "Generated according to latest IR's RDD (from most recent Order calc which is now closed)."
 msgstr "Généré en fonction de la DLS du dernier DI (depuis le plus récent Calcul de commande fermé)."
 
-#. module: procurement_cycle
+#. module: procurement_cycle, account_hq_entries
 #: view:replenishment.segment:0
 #: field:replenishment.segment,last_generation:0
+#: code:addons/account_hq_entries/report/finance_cost_price.py:63
 msgid "Generation Date"
 msgstr "Date Génération"
 
@@ -117771,6 +117877,7 @@
 
 #. module: account_hq_entries
 #: selection:hq.entries.import,state:0
+#: selection:esc.line.import,state:0
 msgid "In-progress"
 msgstr "En cours"
 
@@ -118884,6 +118991,7 @@
 #: view:account.bank.statement.line:0
 msgid "Only This Journal"
 msgstr "Seulement Ce Journal"
+<<<<<<< TREE
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1058
@@ -119224,3 +119332,366 @@
 #: report:shipment.donation.certificate:0
 msgid "Additional items:"
 msgstr "Éléments supplémentaires:"
+=======
+
+#. module: account_hq_entries
+#: view:esc_line.setup:0
+#: model:ir.actions.act_window,name:account_hq_entries.action_esc_line_setup
+msgid "Activate International Invoices Lines"
+msgstr "Activer les Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: field:esc_line.setup,esc_line:0
+msgid "Activate International Invoices Lines ?"
+msgstr "Activer les Lignes de Factures Internationales ?"
+
+#. module: account_hq_entries
+#: field:esc.invoice.line,consignee_cc_id:0
+msgid "Consignee Cost Center"
+msgstr "Centre de Coût de Destination"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:222
+#, python-format
+msgid "Consignee Cost Center/Instance %s not found or does not match any active instance."
+msgstr "Centre coût / Instance de Destination %s non trouvé ou ne correspondant pas à une instance active."
+
+#. module: account_hq_entries
+#: field:esc.invoice.line,imported_consignee_instance:0
+msgid "Consignee Instance"
+msgstr "Instance Destinataire"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:260
+#, python-format
+msgid "Currency is mandatory."
+msgstr "Devise obligatoire."
+
+#. module: account_hq_entries
+#: model:ir.actions.server,name:account_hq_entries.esc_line_delete_action
+msgid "Delete Selected draft entries"
+msgstr "Supprimer les lignes brouillon sélectionnées"
+
+#. module: account_hq_entries
+#: view:esc.invoice.line:0
+msgid "Do you want to delete this line ?"
+msgstr "Voulez-vous supprimer cette ligne ?"
+
+#. module: account_hq_entries
+#: view:esc.line.import:0
+msgid "Download Empty Template"
+msgstr "Télécharger le modèle"
+
+#. module: account_hq_entries
+#: view:esc.line.import:0
+msgid "Download Rejected Lines"
+msgstr "Télécharger les lignes rejetées"
+
+#. module: product
+#: selection:product.mass.update,type_of_ed_bn:0
+msgid "ED Only"
+msgstr "Seulement DE"
+
+#. module: account_hq_entries
+#: field:esc.invoice.line,shipment_ref:0
+msgid "Field mapping with IN"
+msgstr "Mappage avec IN"
+
+#. module: product
+#: selection:product.price.type,field:0
+#: field:product.template,finance_price:0
+msgid "Finance Cost Price"
+msgstr "Prix Finance"
+
+#. module: account_hq_entries
+#: model:ir.model,name:account_hq_entries.model_finance_price_track_changes
+msgid "Finance Price Track changes"
+msgstr "Changements du Prix Finance"
+
+#. module: product
+#: view:product.product:0
+msgid "HQ Merge product"
+msgstr "Fusion Siège de produits"
+
+#. module: account_hq_entries
+#: field:esc.invoice.line,in_number:0
+msgid "IN Number"
+msgstr "Numéro IN"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:82
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:134
+#: model:ir.model,name:account_hq_entries.model_esc_line_import
+#, python-format
+msgid "Import International Invoices Lines"
+msgstr "Import de Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:321
+#, python-format
+msgid "Imported with error(s)"
+msgstr "Importé avec des erreurs"
+
+#. module: account_hq_entries
+#: view:esc.invoice.line:0
+#: model:ir.model,name:account_hq_entries.model_esc_invoice_line
+msgid "International Invoices Line"
+msgstr "Ligne de Factures Internationales"
+
+#. module: account_hq_entries
+#: model:ir.actions.act_window,name:account_hq_entries.esc_invoice_line_action
+#: model:ir.ui.menu,name:account_hq_entries.esc_invoice_line_menu
+msgid "International Invoices Lines"
+msgstr "Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: view:esc.line.import:0
+#: model:ir.actions.server,name:account_hq_entries.esc_line_import_action
+#: model:ir.ui.menu,name:account_hq_entries.esc_line_import_menu
+msgid "International Invoices Lines Import"
+msgstr "Import de Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:100
+#: model:ir.actions.report.xml,name:account_hq_entries.esc_line_import_template
+#, python-format
+msgid "International Invoices Lines Template"
+msgstr "Modèle de Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:324
+#, python-format
+msgid "International Invoices Lines import successful"
+msgstr "Import réussi des Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: view:esc.invoice.line:0
+msgid "International Invoices Liness"
+msgstr "Lignes de Factures Internationales"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:111
+#: model:ir.actions.report.xml,name:account_hq_entries.esc_line_import_rejected
+#, python-format
+msgid "International Invoices Rejected Lines"
+msgstr "Lignes Internationales Rejetées"
+
+#. module: account_hq_entries
+#: field:finance_price.track_changes,esc_invoice_line_id:0
+msgid "International Line"
+msgstr "Ligne Internationale"
+
+#. module: account_hq_entries
+#: selection:finance_price.track_changes,matching_type:0
+msgid "International Lines"
+msgstr "Lignes Internationales"
+
+#. module: account_hq_entries
+#: view:esc.line.import:0
+msgid "Keep import results and close the window"
+msgstr "Garder les résultats de l'import et fermer la fenêtre."
+
+#. module: account_hq_entries
+#: view:finance_price.track_changes:0
+#: model:ir.actions.act_window,name:account_hq_entries.finance_price_track_changes_action
+#: model:ir.ui.menu,name:account_hq_entries.finance_price_track_changes_menu
+msgid "Line Matching"
+msgstr "Correspondance des lignes"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:312
+#, python-format
+msgid "Line duplicated in the system"
+msgstr "Ligne dupliquée dans le système"
+
+#. module: account_hq_entries
+#: model:ir.actions.act_window,name:account_hq_entries.esc_line_to_finance_price_tc
+msgid "Matching"
+msgstr "Correspondance"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/report/finance_cost_price.py:76
+#: field:finance_price.track_changes,matching_type:0
+#, python-format
+msgid "Matching Type"
+msgstr "Type de correspondance"
+
+#. module: account_hq_entries
+#: field:finance_price.track_changes,stock_move_id:0
+msgid "Move line"
+msgstr "Mouvement"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/report/finance_cost_price.py:71
+#: field:finance_price.track_changes,new_price:0
+#, python-format
+msgid "New Finance Price"
+msgstr "Nouveau Prix Finance"
+
+#. module: product
+#: selection:product.mass.update,type_of_ed_bn:0
+msgid "No BN/No ED"
+msgstr "Pas NL/Pas DE"
+
+#. module: account_hq_entries
+#: view:esc.invoice.line:0
+msgid "Not Done"
+msgstr "Non clôturé"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/report/finance_cost_price.py:70
+#, python-format
+msgid "Old Finance Price"
+msgstr "Ancien Prix Finance"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:197
+#, python-format
+msgid "Order ref %s does not match the PO pattern"
+msgstr "La Réf. de Commande %s ne correspond pas au format d'un BdC"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:192
+#, python-format
+msgid "Order ref is mandatory"
+msgstr "Réf. de Commande obligatoire."
+
+#. module: account_hq_entries
+#: field:finance_price.track_changes,purchase_oder_line_id:0
+msgid "PO line"
+msgstr "Ligne BdC"
+
+#. module: product
+#: code:addons/product/wizard/product_mass_update.py:426
+#, python-format
+msgid "Please limit your query to a maximum of 500 products."
+msgstr "Veuillez restreindre la recherche à un maximum de 500 produits."
+
+#. module: account_hq_entries
+#: field:finance_price.track_changes,old_price:0
+msgid "Previous Finance Price"
+msgstr "Précédent Prix Finance"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:234
+#, python-format
+msgid "Product Code %s not found."
+msgstr "Code Produit %s non trouvé."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:227
+#, python-format
+msgid "Product Code is mandatory."
+msgstr "Code Produit obligatoire."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:247
+#, python-format
+msgid "Product Quantity %s cannot be 0 or negative"
+msgstr "La Quantité %s ne peut pas être 0 ou négative"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:243
+#, python-format
+msgid "Product Quantity %s is not a number."
+msgstr "La Quantité %s n'est pas un nombre."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:238
+#, python-format
+msgid "Product quantity is mandatory."
+msgstr "La Quantité est obligatoire."
+
+#. module: product
+#: field:product.mass.update,not_activated_product_ids:0
+#: field:product.mass.update,not_deactivated_product_ids:0
+msgid "Product(s) that can not be deactivated"
+msgstr "Produit(s) qui ne peuvent pas être désativé(s)"
+
+#. module: account_hq_entries
+#: field:finance_price.track_changes,stock_before:0
+msgid "Qty in Stock Before"
+msgstr "Qté en stock avant"
+
+#. module: account_hq_entries
+#: field:finance_price.track_changes,qty_processed:0
+msgid "Quantity Processed"
+msgstr "Quantité Traitée"
+
+#. module: account_hq_entries
+#: sql_constraint:esc.invoice.line:0
+msgid "Quantity must be greater than 0."
+msgstr "La Quantité doit être supérieure à 0."
+
+#. module: account_hq_entries
+#: model:ir.model,name:account_hq_entries.model_esc_line_import_rejected
+msgid "Rejected Lines"
+msgstr "Lignes Rejetées"
+
+#. module: account_hq_entries
+#: field:esc.invoice.line,remaining_qty:0
+msgid "Remaining Quantity"
+msgstr "Quantié Restante"
+
+#. module: account_hq_entries
+#: field:esc.invoice.line,requestor_cc_id:0
+msgid "Requestor Cost Center"
+msgstr "Centre de Coût du Demandeur"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:206
+#, python-format
+msgid "Requestor Cost Center %s not found or does not match any active instance."
+msgstr "Centre de Coût du demandeur %s non trouvé ou ne correspondant pas à une instance active."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:201
+#, python-format
+msgid "Requestor Cost Center is mandatory"
+msgstr "Le Centre de Coût du demandeur est obligatoire"
+
+#. module: account_hq_entries
+#: view:esc.line.import:0
+msgid "Reset import and close the window"
+msgstr "Mise à zéro de l'import et fermeture de la fenêtre"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/report/finance_cost_price.py:73
+#, python-format
+msgid "Stock Level Before"
+msgstr "Niveau de Stock Avant"
+
+#. module: account_hq_entries
+#: view:esc.line.import:0
+msgid "This will import lines from a SpreadSheet xml file."
+msgstr "Imported des lines depuis un fichier au format Feuille de Calcul XML 2003"
+
+#. module: account_hq_entries
+#: model:ir.actions.report.xml,name:account_hq_entries.report_finance_cost_price
+msgid "Track Changes Finance Price"
+msgstr "Suivi des changements du Prix Finance"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:256
+#, python-format
+msgid "Unit Price %s is not a number."
+msgstr "Prix Unitaire %s n'est pas un nombre."
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:251
+#, python-format
+msgid "Unit Price is mandatory."
+msgstr "Le Prix Unitaire est obligatoire"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:188
+#, python-format
+msgid "a row must have 8 columns"
+msgstr "une ligne doit avoir 8 colonnes"
+
+#. module: account_hq_entries
+#: code:addons/account_hq_entries/wizard/esc_lines_import.py:310
+#, python-format
+msgid "duplicates line %d"
+msgstr "ligne dupliquée %d"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2023-05-03 10:23:38 +0000
+++ bin/addons/msf_profile/msf_profile.py	2023-05-05 12:01:38 +0000
@@ -57,6 +57,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF29.0
     def us_11177_bn_for_kcl_items(self, cr, uid, *a, **b):
         '''
@@ -198,6 +199,16 @@
         cr.execute("update ir_translation set name='account.analytic.account,nameko' where name='account.analytic.account,name' and type='model'")
         return True
 
+=======
+    # UF29.0
+    def us_10835_disable_iil_menu(self, cr, uid, *a, **b):
+        # hide menuitems
+        setup_obj = self.pool.get('esc_line.setup')
+        esc_line_install = setup_obj.create(cr, uid, {})
+        setup_obj.execute(cr, uid, [esc_line_install])
+
+
+>>>>>>> MERGE-SOURCE
     # UF28.0
     def us_10885_tc_entries(self, cr, uid, *a, **b):
         current_instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2023-02-17 14:02:08 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2023-05-05 12:01:38 +0000
@@ -6,7 +6,7 @@
 msf_sync_data_server.fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&', '&','&','&', ('claim_name_goods_return', '=', False), ('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,,Valid
 msf_sync_data_server.update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&','&', ('partner_type_stock_picking', 'not in', ['esc', 'external']),('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,,Valid
 msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date', 'ir_name_for_sync', 'original_instance']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel']), ('from_synchro_return_goods', '=', False), ('order_id.active', '=', 't')]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
-msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'in_name_goods_return', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment', 'from_cancel_out', 'pol_external_ref', 'dpo_line_id/.id', 'dpo_id/.id', 'sync_pushed_from_po', 'esti_dd']","[('order_id.partner_type', '!=', 'external'), ('order_id.active', '=', 't'), ('state', '!=', 'draft'), ('order_id.procurement_request', '=', False), ('product_uom_qty', '!=', 0.0), '!', '&', ('order_id.fo_created_by_po_sync', '=', False), ('order_id.state', '=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,"[('order_id.procurement_request', '=', False), ('order_id.active', '=', 't'), ('order_id.state', 'in', ['draft', 'draft_p']), ('order_id.partner_type', 'not in', ['external', 'esc']), ('order_id.client_order_ref', '=', False)]",Valid
+msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'in_name_goods_return', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment', 'from_cancel_out', 'pol_external_ref', 'dpo_line_id/.id', 'dpo_id/.id', 'dpo_id/partner_type', 'sync_pushed_from_po', 'esti_dd']","[('order_id.partner_type', '!=', 'external'), ('order_id.active', '=', 't'), ('state', '!=', 'draft'), ('order_id.procurement_request', '=', False), ('product_uom_qty', '!=', 0.0), '!', '&', ('order_id.fo_created_by_po_sync', '=', False), ('order_id.state', '=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,"[('order_id.procurement_request', '=', False), ('order_id.active', '=', 't'), ('order_id.state', 'in', ['draft', 'draft_p']), ('order_id.partner_type', 'not in', ['external', 'esc']), ('order_id.client_order_ref', '=', False)]",Valid
 msf_sync_data_server.pol_update_date_expected,TRUE,TRUE,"['sync_local_id', 'sync_linked_pol']","[('id', '=', 0)]",partner_id,MISSION,purchase.order.line.update_date_expected,sale.order.line,Update IN expected date,55,,Valid
 msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'previous_step_id/name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'packing_list', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'move_lines/sale_line_id/resourced_original_remote_line', 'move_lines/from_pack', 'move_lines/to_pack', 'move_lines/weight', 'move_lines/height', 'move_lines/length', 'move_lines/width',  'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', 'in', ['done', 'delivered']), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid
 msf_sync_data_server.moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True), ('new_dpo_out', '=', False)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,,Valid
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2023-03-08 09:08:44 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2023-05-05 12:01:38 +0000
@@ -187,3 +187,5 @@
 msf_sync_data_server.stock_mission_report_line_location_remote,TRUE,TRUE,TRUE,TRUE,bidirectional,Up,"[('location_id.usage', '=', 'internal')]","['location_name', 'product_id/id', 'quantity', 'last_mod_date', 'instance_id/id', 'uom_id/id']",MISSION,stock.mission.report.line.location,,Remote Stock Level,Valid,,1030
 msf_sync_data_server.account_mcdb,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('description', '!=', False), ('synced', '=', True), ('hq_template', '=', True)]","['abs_id/id', 'account_ids/id', 'account_type_ids/id', 'amount_book_from', 'amount_book_to', 'amount_from', 'amount_func_from', 'amount_func_to', 'amount_to', 'analytic_account_cc_ids/id', 'analytic_account_dest_ids/id', 'analytic_account_f1_ids/id', 'analytic_account_f2_ids/id', 'analytic_account_fp_ids/id', 'analytic_axis', 'analytic_journal_ids/id', 'booking_currency_id/id', 'cheque_number', 'copied_id/id', 'currency_choice', 'currency_id/id', 'description', 'display_account', 'display_analytic_account', 'display_analytic_journal', 'display_analytic_period', 'display_cost_center', 'display_destination', 'display_employee', 'display_free1', 'display_free2', 'display_funding_pool', 'display_in_output_currency/id', 'display_instance', 'display_journal', 'display_mcdb_load_button', 'display_partner', 'display_period', 'display_top_prop_instance', 'display_transfer_journal', 'display_type', 'document_code', 'document_date_from', 'document_date_to', 'document_state', 'employee_id/id', 'employee_ids/id', 'fiscalyear_id/id', 'functional_currency_id/id', 'fx_table_id/id', 'instance_ids/id', 'journal_ids/id', 'model', 'name', 'open_items/id', 'partner_id/id', 'partner_ids/id', 'partner_txt', 'period_ids/id', 'posting_date_from', 'posting_date_to', 'reallocated', 'reconciled', 'reconcile_date', 'reconcile_id/id', 'ref', 'rev_account_ids', 'rev_account_type_ids', 'rev_analytic_account_cc_ids', 'rev_analytic_account_dest_ids', 'rev_analytic_account_f1_ids', 'rev_analytic_account_f2_ids', 'rev_analytic_account_fp_ids', 'rev_analytic_journal_ids', 'rev_employee_ids', 'reversed', 'rev_instance_ids', 'rev_journal_ids', 'rev_partner_ids', 'rev_period_ids', 'rev_top_prop_instance_ids', 'rev_transfer_journal_ids', 'top_prop_instance_ids/id', 'transfer_journal_id/id', 'transfer_journal_ids/id', 'hq_template', 'include_related_entries', 'excl_inactive_journal_ids', 'inactive_at']",HQ + MISSION,account.mcdb,,Selector,Valid,,1040
 msf_sync_data_server.finance_report_template,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('synced', '=', True), ('hq_template', '=', True)]","['last_modification', 'name', 'sync_values', 'wizard_name', 'hq_template']",HQ + MISSION,wizard.template,,Finance Report Templates,Valid,,1050
+msf_sync_data_server.iil_down,TRUE,TRUE,FALSE,FALSE,bidirectional,Single-Private,"[('state', '=', '1_draft')]","['po_name', 'requestor_cc_id/id', 'consignee_cc_id/id', 'product_id/id', 'price_unit', 'product_qty', 'uom_id/id', 'currency_id/id', 'shipment_ref', 'dest_instance_id/id']",HQ + MISSION,esc.invoice.line,dest_instance_id,Down ESC Invoices Lines,Valid,,1300
+msf_sync_data_server.iil_up,TRUE,TRUE,FALSE,FALSE,bidirectional,Single-Private,"[('state', '=', 'done')]","['state', 'remaining_qty', 'dest_instance_id/id']",HQ + MISSION,esc.invoice.line,dest_instance_id,UP ESC Invoices Lines state,Valid,,1305
 
=== modified file 'bin/addons/product/product.py'
--- bin/addons/product/product.py	2023-03-15 13:17:31 +0000
+++ bin/addons/product/product.py	2023-05-05 12:01:38 +0000
@@ -314,6 +314,14 @@
             res[obj.id] = list_price
         return res
 
+    def _get_finance_price_currency_id(self, cr, uid, ids, fields, arg, context=None):
+        ret = {}
+        cur_id = self.pool.get('res.users').get_company_currency_id(cr, uid)
+
+        for _id in ids:
+            ret[_id] = cur_id
+        return ret
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager',help="This is use as task responsible"),
@@ -328,6 +336,8 @@
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
         'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Account Computation'), help="Price of product calculated according to the selected costing method."),
+        'finance_price': fields.float('Finance Cost Price', readonly=1, digits_compute=dp.get_precision('Account Computation')),
+        'finance_price_currency_id': fields.function(_get_finance_price_currency_id, 'Finance CP Currency', method=True, type='many2one', relation='res.currency'),
         'list_price': fields.function(_get_list_price, method=True, type='float', string='Sale Price', digits_compute=dp.get_precision('Sale Price Computation'), help="Base price for computing the customer price. Sometimes called the catalog price.",
                                       store = {
             'product.template': (lambda self, cr, uid, ids, c=None: ids, ['standard_price'], 10),
 
=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2023-04-26 14:14:45 +0000
+++ bin/addons/product_attributes/product_attributes.py	2023-05-05 12:01:38 +0000
@@ -1168,6 +1168,12 @@
                 field.set('invisible', '0')
             res['arch'] = etree.tostring(root)
 
+        if view_type == 'form' and self.pool.get('unifield.setup.configuration').get_config(cr, uid, 'esc_line'):
+            root = etree.fromstring(res['arch'])
+            for field in root.xpath('//field[@name="finance_price"]|//field[@name="finance_price_currency_id"]'):
+                field.set('invisible', '0')
+            res['arch'] = etree.tostring(root)
+
         if view_type == 'search' and context.get('available_for_restriction'):
             context.update({'search_default_not_restricted': 1})
             root = etree.fromstring(res['arch'])
 
=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2023-04-26 14:14:45 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2023-05-05 12:01:38 +0000
@@ -94,6 +94,8 @@
                                 <field name="currency_id" nolabel="1" />
                                 <field name="list_price" colspan="2"/>
                                 <field name="field_currency_id" nolabel="1" />
+                                <field name="finance_price" colspan="2" invisible="1" />
+                                <field name="finance_price_currency_id" nolabel="1" invisible="1" />
                                 <newline/>
                             </group>
 
 
=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2023-02-09 11:14:39 +0000
+++ bin/addons/purchase/purchase_order_line.py	2023-05-05 12:01:38 +0000
@@ -666,6 +666,7 @@
         'max_qty_cancellable': fields.function(_in_qty_remaining, type='float', string='Total PO qty - already processed + assign qty + confirm qty', method=1, multi='in_remain'),
         'from_dpo_line_id': fields.integer('DPO line id on the remote', internal=1),
         'from_dpo_id': fields.integer('DPO id on the remote', internal=1),
+        'from_dpo_esc': fields.boolean('Line sourced to ESC DPO', internal=1),
         'dates_modified': fields.boolean('EDD/CDD modified on validated line', internal=1),
         'loan_line_id': fields.many2one('sale.order.line', string='Linked loan line', readonly=True),
 
 
=== modified file 'bin/addons/stock/stock_move.py'
--- bin/addons/stock/stock_move.py	2023-02-10 11:14:12 +0000
+++ bin/addons/stock/stock_move.py	2023-05-05 12:01:38 +0000
@@ -38,8 +38,14 @@
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
-        for line in self.browse(cr, uid, ids, context=context):
-            res.append((line.id, (line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
+        if context is None:
+            context = {}
+        for line in self.browse(cr, uid, ids, fields_to_fetch=['product_id', 'line_number', 'location_id', 'location_dest_id'], context=context):
+            if context.get('display_move_line'):
+                prefix = '#%s %s' % (line.line_number, line.product_id.code or '/')
+            else:
+                prefix = line.product_id.code or '/'
+            res.append((line.id, '%s: %s > %s' % (prefix, line.location_id.name, line.location_dest_id.name)))
         return res
 
     def _get_picking_ids(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/sync_client/update.py'
--- bin/addons/sync_client/update.py	2023-01-31 10:36:54 +0000
+++ bin/addons/sync_client/update.py	2023-05-05 12:01:38 +0000
@@ -209,7 +209,12 @@
                 return 0
             domain.append(('id', 'in', ids_need_to_push))
 
-            ids_to_compute = self.search_ext(cr, uid, domain, context=context)
+            order = None
+            if hasattr(self, '_sync_order'):
+                # keep same id order at HQ and lower level
+                order = self._sync_order
+
+            ids_to_compute = self.search_ext(cr, uid, domain, order=order, context=context)
             if not ids_to_compute:
                 return 0
 
 
=== modified file 'bin/addons/sync_common/common.py'
--- bin/addons/sync_common/common.py	2022-09-22 12:45:25 +0000
+++ bin/addons/sync_common/common.py	2023-05-05 12:01:38 +0000
@@ -45,6 +45,7 @@
     'cost.center.distribution.line',
     'country.export.mapping',
     'distribution.line',
+    'esc.invoice.line',
     'financing.contract.contract',
     'financing.contract.donor',
     'financing.contract.format',
 
=== modified file 'bin/addons/sync_server/rules.py'
--- bin/addons/sync_server/rules.py	2017-10-12 08:16:17 +0000
+++ bin/addons/sync_server/rules.py	2023-05-05 12:01:38 +0000
@@ -120,6 +120,7 @@
             ('down', 'Down'),
             ('bidirectional', 'Bidirectional'),
             ('bi-private', 'Bidirectional-Private'),
+            ('single-private', 'Single-Private'),
         ], 'Directionality', required = True,),
         'domain':fields.text('Domain', required = False),
         'owner_field':fields.char('Owner Field', size = 64, required = False),
@@ -459,7 +460,8 @@
         return (message, error)
 
     def check_owner_field(self, cr, uid, rec, context=None):
-        if rec.direction != 'bi-private': return ('', False)
+        if rec.direction not in ('bi-private', 'single-private'):
+            return ('', False)
         error = False
         message = "* Owner field existence... "
         try:
@@ -517,6 +519,10 @@
             error = err or error
             message.append(mess)
 
+            if rec.direction == 'single-private' and rec.can_delete:
+                error = True
+                message.append('Single-Private and Can delete not implemented')
+
             message.append("* Sequence is unique... ")
             if self.search(cr, uid,
                            [('sequence_number','=',rec.sequence_number)],
 
=== modified file 'bin/addons/sync_server/rules_view.xml'
--- bin/addons/sync_server/rules_view.xml	2017-11-14 10:57:04 +0000
+++ bin/addons/sync_server/rules_view.xml	2023-05-05 12:01:38 +0000
@@ -92,7 +92,7 @@
                             <field name="can_delete" />
                             <field name="handle_priority"/>
                             <field name="direction" on_change="invalidate(model_ref)" string="Direction"/>
-                            <field name="owner_field" on_change="invalidate(model_ref)" attrs="{'invisible':[('direction','!=','bi-private')], 'required':[('direction','=','bi-private')]}" colspan="4"/>
+                            <field name="owner_field" on_change="invalidate(model_ref)" attrs="{'invisible':[('direction','not int',['bi-private', 'single-private'])], 'required':[('direction','in',['bi-private', 'single-private'])]}" colspan="4"/>
                             <field name="master_data" />
                         </group>
                         <group col="2">
 
=== modified file 'bin/addons/sync_server/sync_server.py'
--- bin/addons/sync_server/sync_server.py	2022-07-22 12:54:50 +0000
+++ bin/addons/sync_server/sync_server.py	2023-05-05 12:01:38 +0000
@@ -1097,6 +1097,9 @@
                                 to_retrieve.append(x)
                     else:
                         to_retrieve = list_to_retrieve
+                elif rules[update.rule_id.id]['direction'] == 'single-private':
+                    if update.owner:
+                        to_retrieve.append(update.owner.id)
 
                 puller_ids = [y.entity_id.id for y in update.puller_ids]
                 not_pulled = []
 
=== modified file 'bin/addons/sync_server/update.py'
--- bin/addons/sync_server/update.py	2021-02-01 16:59:12 +0000
+++ bin/addons/sync_server/update.py	2023-05-05 12:01:38 +0000
@@ -454,6 +454,8 @@
                 else:
                     privates = self.pool.get('sync.server.entity')._get_ancestor(cr, uid, update.owner.id, context=context) + \
                         [update.owner.id]
+            elif update.rule_id.direction == 'single-private' and update.owner:
+                privates = [update.owner.id]
             else:
                 privates = []
             if (update.rule_id.direction == 'up' and update.source.id in children) or \
@@ -530,6 +532,7 @@
         if recover:
             filters.append("source = %s" % (entity.id, ))
         filters.append("direction = 'bi-private' AND (is_deleted = 't' OR owner IN (" + (','.join(map(str, children + [entity.id]))) + "))")
+        filters.append("direction = 'single-private' AND owner = %d " % (entity.id,))
         base_query += ' AND ((' + ') OR ('.join(filters) + '))'
 
         ## Recover add own client updates to the list
 
=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2023-02-17 13:56:40 +0000
+++ bin/addons/sync_so/purchase.py	2023-05-05 12:01:38 +0000
@@ -144,6 +144,7 @@
         pol_values['modification_comment'] = sol_dict.get('modification_comment', False)
         pol_values['from_dpo_line_id'] = sol_dict.get('dpo_line_id') and sol_dict.get('dpo_line_id', {}).get('.id', False) or False
         pol_values['from_dpo_id'] = sol_dict.get('dpo_id') and sol_dict.get('dpo_id', {}).get('.id', False) or False
+        pol_values['from_dpo_esc'] = sol_dict.get('dpo_id') and sol_dict.get('dpo_id', {}).get('partner_type', False) == 'esc' or False
         pol_values['esti_dd'] = sol_dict.get('esti_dd', False)
         if 'line_number' in pol_values:
             del(pol_values['line_number'])
 
=== modified file 'bin/addons/unifield_setup/setup_configuration.py'
--- bin/addons/unifield_setup/setup_configuration.py	2022-09-19 08:45:17 +0000
+++ bin/addons/unifield_setup/setup_configuration.py	2023-05-05 12:01:38 +0000
@@ -62,6 +62,7 @@
         'previous_fy_dates_allowed': fields.boolean(string='Does the system allow document dates on previous Fiscal Year?'),
         'customer_commitment': fields.boolean(string='Does the system allow Customer Commitment Vouchers ?'),
         'signature': fields.boolean(string='Activate Electronic Validation ?'),
+        'esc_line': fields.boolean(string='Activate International Invoices Lines ?'),
     }
 
     _defaults = {
@@ -79,6 +80,7 @@
         'previous_fy_dates_allowed': lambda *a: False,
         'customer_commitment': False,
         'signature': False,
+        'esc_line': False,
     }
 
     _constraints = [