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

[jftempo]

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2020-04-29 09:22:58 +0000
+++ bin/addons/account/invoice.py	2021-02-01 16:08:13 +0000
@@ -459,6 +459,10 @@
                     ctx.update({'type': vals['type']})
                 if '_terp_view_name' in ctx:
                     del ctx['_terp_view_name']
+                # if we click on the res.log...
+                ctx.update({'from_inv_form': True,  # ...we are sent to the invoice form...
+                            'from_split': False,  # ...and won't be in a split process.
+                            })
                 message = _("Invoice '%s' is waiting for validation.") % name
                 self.log(cr, uid, inv_id, message, context=ctx)
             return res
@@ -1341,6 +1345,9 @@
             if 'invoice_line_tax_id' in line:
                 line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
 
+            if 'purchase_order_line_ids' in line:
+                line['purchase_order_line_ids'] = [(6, 0, line.get('purchase_order_line_ids', []))]
+
             if 'analytic_distribution_id' in line:
                 if line.get('analytic_distribution_id', False) and line.get('analytic_distribution_id')[0]:
                     distrib_id = line.get('analytic_distribution_id')[0]
@@ -2132,7 +2139,10 @@
 
     def get(self, cr, uid, key, key2, models, meta=False, context=None, res_id_req=False, without_user=True, key2_req=True, view_id=False):
         """
-        Hides the Report "Invoice Excel Export" in the menu of other invoices than IVO/IVI
+        Hides the reports:
+        - "Invoice Excel Export" in the menu of other invoices than IVO/IVI
+        - "FO Follow-up Finance" in the menu of other invoices than IVO/STV
+        - "STV/IVO lines follow-up" in the menu of other invoices than IVO/STV (+ renames it depending on the inv. type)
         """
         if context is None:
             context = {}
@@ -2140,9 +2150,22 @@
         model_names = [x[0] for x in models]
         if key == 'action' and key2 == 'client_print_multi' and 'account.invoice' in model_names:
             new_act = []
+            context_ivo = context.get('type', False) == 'out_invoice' and context.get('journal_type', False) == 'intermission' and \
+                context.get('is_intermission', False) and context.get('intermission_type', False) == 'out'
+            context_stv = context.get('type', False) == 'out_invoice' and context.get('journal_type', False) == 'sale' and \
+                not context.get('is_debit_note', False)
             for v in values:
+                # renaming
+                if len(v) > 2 and v[1] == 'invoice_lines_follow_up' and v[2].get('name'):
+                    if context_ivo:
+                        v[2]['name'] = _('IVO lines follow-up')
+                    elif context_stv:
+                        v[2]['name'] = _('STV lines follow-up')
+                # display
                 if not context.get('is_intermission') and len(v) > 2 and v[2].get('report_name', '') == 'invoice.excel.export':
                     continue
+                elif not context_ivo and not context_stv and len(v) > 1 and v[1] in ('fo_follow_up_finance', 'invoice_lines_follow_up'):
+                    continue
                 else:
                     new_act.append(v)
             values = new_act

=== modified file 'bin/addons/account_override/account_invoice_sync.py'
--- bin/addons/account_override/account_invoice_sync.py	2020-05-06 12:24:37 +0000
+++ bin/addons/account_override/account_invoice_sync.py	2021-02-01 16:08:13 +0000
@@ -150,7 +150,8 @@
                 'product_id': product_id,
                 'uos_id': uom_id,
             }
-            if from_supply and inv_linked_po and inv_line.get('sale_order_line_id', {}).get('sync_local_id'):
+            fo_line_dict = inv_line.get('sale_order_line_id') or {}
+            if from_supply and inv_linked_po and fo_line_dict.get('sync_local_id'):
                 # fill in the AD at line level if applicable
                 # search the matching between PO line and invoice line
                 po_line_ids = pol_obj.search(cr, uid, [('order_id', '=', inv_linked_po.id), ('sync_linked_sol', '=', inv_line['sale_order_line_id']['sync_local_id'])], context=context)

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2020-09-10 15:03:42 +0000
+++ bin/addons/account_override/invoice.py	2021-02-01 16:08:13 +0000
@@ -1419,13 +1419,18 @@
                 # get current merge vals for account or create new
                 if l.account_id.id in by_account_vals:
                     vals = by_account_vals[l.account_id.id]
+                    if l.order_line_id:
+                        vals.setdefault('purchase_order_line_ids', []).append(l.order_line_id.id)
                 else:
                     # new account to merge
                     vals = vals_template.copy()
                     vals.update({
                         '_index_': index,
                         'account_id': l.account_id.id,
+                        'purchase_order_line_ids': [],
                     })
+                    if l.order_line_id:
+                        vals['purchase_order_line_ids'].append(l.order_line_id.id)
                     index += 1
 
                 '''
@@ -1506,6 +1511,8 @@
                 vals['invoice_line_tax_id'] = vals['invoice_line_tax_id'] \
                     and [(6, 0, vals['invoice_line_tax_id'])] or False
 
+                vals['purchase_order_line_ids'] = vals['purchase_order_line_ids'] and [(6, 0, vals['purchase_order_line_ids'])] or False
+
                 # create merge line
                 vals.update({'merged_line': True})
                 if not self.pool.get('account.invoice.line').create(cr, uid,
@@ -1662,6 +1669,26 @@
             'res_id': [wiz_id],
         }
 
+    def get_invoice_lines_follow_up(self, cr, uid, ids, context=None):
+        """
+        Prints the FO Follow-Up Finance report related to the IVO or STV selected
+        """
+        if context is None:
+            context = {}
+        follow_up_wizard = self.pool.get('fo.follow.up.finance.wizard')
+        inv_ids = context.get('active_ids')
+        if not inv_ids:
+            raise osv.except_osv(_('Error'),
+                                 _('Please select at least one record!'))
+        if isinstance(inv_ids, (int, long)):
+            inv_ids = [inv_ids]
+        context.update({
+            'selected_inv_ids': inv_ids,
+            'is_intermission': self.browse(cr, uid, inv_ids[0], fields_to_fetch=['is_intermission']).is_intermission,
+        })
+        wiz_id = follow_up_wizard.create(cr, uid, {}, context=context)
+        return follow_up_wizard.print_excel(cr, uid, [wiz_id], context=context)
+
 
 account_invoice()
 
@@ -1916,6 +1943,8 @@
         and without link to PO/FO lines when the duplication is manual
         Reset the merged_line tag.
         """
+        if context is None:
+            context = {}
         if default is None:
             default = {}
         default.update({'move_lines': False,
@@ -1924,11 +1953,12 @@
                         })
         # Manual duplication should generate a "manual document not created through the supply workflow"
         # so we don't keep the link to PO/FO at line level
-        if context.get('from_button', False):
+        if context.get('from_button') and not context.get('from_split'):
             default.update({
                 'order_line_id': False,
                 'sale_order_line_id': False,
                 'sale_order_lines': False,
+                'purchase_order_line_ids': [],
             })
         return super(account_invoice_line, self).copy_data(cr, uid, inv_id, default, context)
 

=== modified file 'bin/addons/finance/__openerp__.py'
--- bin/addons/finance/__openerp__.py	2019-10-10 15:06:49 +0000
+++ bin/addons/finance/__openerp__.py	2021-02-01 16:08:13 +0000
@@ -39,6 +39,7 @@
         'account_analytic_line_view.xml',
         'account_sequence.xml',
         'wizard/account_report_partner_balance_tree_view.xml', # uf-1715
+        'wizard/fo_follow_up_finance_wizard_view.xml',
         'cash_request_data.xml',
         'cash_request_view.xml',
     ],

=== modified file 'bin/addons/finance/invoice.py'
--- bin/addons/finance/invoice.py	2017-10-20 09:43:54 +0000
+++ bin/addons/finance/invoice.py	2021-02-01 16:08:13 +0000
@@ -83,6 +83,8 @@
     _columns = {
         'order_line_id': fields.many2one('purchase.order.line', string="Purchase Order Line", readonly=True,
                                          help="Purchase Order Line from which this invoice line has been generated (when coming from a purchase order)."),
+        'purchase_order_line_ids': fields.many2many('purchase.order.line', 'inv_line_po_line_rel', 'inv_line_id', 'po_line_id',
+                                                    string="Purchase Order Lines", help="Used in case of merged invoice lines"),
     }
 
 account_invoice_line()

=== modified file 'bin/addons/finance/report/__init__.py'
--- bin/addons/finance/report/__init__.py	2017-12-08 14:20:22 +0000
+++ bin/addons/finance/report/__init__.py	2021-02-01 16:08:13 +0000
@@ -1,3 +1,4 @@
 import account_partner_balance_tree
 import account_report_name
 import cash_request_parser
+import fo_follow_up_finance

=== added file 'bin/addons/finance/report/fo_follow_up_finance.py'
--- bin/addons/finance/report/fo_follow_up_finance.py	1970-01-01 00:00:00 +0000
+++ bin/addons/finance/report/fo_follow_up_finance.py	2021-02-01 16:08:13 +0000
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2020 TeMPO Consulting, MSF. All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+from base import currency_date
+from datetime import datetime
+
+
+class fo_follow_up_finance(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context=None):
+        super(fo_follow_up_finance, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'getLang': self._get_lang,
+            'getReportLines': self._get_report_lines,
+        })
+
+    def _get_lang(self):
+        return self.localcontext.get('lang', 'en_MF')
+
+    def _get_line_fctal_amount(self, line_subtotal, booking_curr_id, doc_date, posting_date, key_state):
+        """
+        Returns the line subtotal in functional currency based on the data in parameter.
+        The state in param. must be the "key" such as "draft" and not the value such as "Draft" or "Brouillon".
+        """
+        line_subtotal_fctal = 0.0
+        user_obj = self.pool.get('res.users')
+        curr_obj = self.pool.get('res.currency')
+        fctal_curr_id = user_obj.browse(self.cr, self.uid, self.uid, fields_to_fetch=['company_id']).company_id.currency_id.id
+        today = datetime.today().strftime('%Y-%m-%d')
+        if booking_curr_id and line_subtotal:
+            if booking_curr_id == fctal_curr_id:
+                line_subtotal_fctal = line_subtotal
+            else:
+                if key_state and key_state == 'draft':
+                    # for draft invoices use today's date
+                    curr_date = today
+                else:
+                    curr_date = currency_date.get_date(self, self.cr, doc_date or today, posting_date or today)
+                line_subtotal_fctal = curr_obj.compute(self.cr, self.uid, booking_curr_id, fctal_curr_id, line_subtotal,
+                                                       round=True, context={'currency_date': curr_date})
+        return line_subtotal_fctal
+
+    def _process_report_lines(self, lines):
+        """
+        Formats the raw data retrieved by the SQL request in _get_report_lines
+        """
+        picking_obj = self.pool.get('stock.picking')
+        shipment_obj = self.pool.get('shipment')
+        processed = {}  # store the transport files processed (perf)
+        for l in lines:
+            # e.g. extract 21/se_HQ1/HT101/PO00011 from se_HQ1C1.21/se_HQ1/HT101/PO00011
+            l['customer_reference'] = l['customer_reference'] and l['customer_reference'].split('.')[-1] or ''
+            key_si_state = l['si_state']
+            l['si_line_subtotal_fctal'] = self._get_line_fctal_amount(l['si_line_subtotal'], l['si_currency_id'],
+                                                                      l['si_doc_date'], l['si_posting_date'], key_si_state)
+            l['si_state'] = key_si_state and self.getSelValue('account.invoice', 'state', key_si_state) or ''
+            l['fo_status'] = l['fo_status'] and self.getSelValue('sale.order', 'state', l['fo_status']) or ''
+            l['fo_line_status'] = l['fo_line_status'] and self.getSelValue('sale.order.line', 'state', l['fo_line_status']) or ''
+            l['is_delivered'] = False
+            if l['transport_file']:
+                if ':' in l['transport_file']:
+                    # e.g. extract "SHIP/00004-01" from "se_HQ1C1.21/se_HQ1/HT101/PO00011 : SHIP/00004-01"
+                    l['transport_file'] = l['transport_file'].split(':')[-1].strip()
+                if l['transport_file'] in processed:
+                    l['is_delivered'] = processed[l['transport_file']]
+                else:
+                    if l['pick_id'] and picking_obj.browse(self.cr, self.uid, l['pick_id'], fields_to_fetch=['state']).state == 'delivered':
+                        l['is_delivered'] = True
+                    elif l.get('transport_file', '').startswith('SHIP') and \
+                            shipment_obj.search_exist(self.cr, self.uid, [('name', '=', l['transport_file']), ('state', '=', 'delivered')]):
+                        l['is_delivered'] = True
+                    processed[l['transport_file']] = l['is_delivered']
+            key_out_inv_state = l['out_inv_state']
+            l['out_inv_line_subtotal_fctal'] = self._get_line_fctal_amount(l['out_inv_line_subtotal'], l['out_inv_currency_id'],
+                                                                           l['out_inv_doc_date'], l['out_inv_posting_date'], key_out_inv_state)
+            l['out_inv_state'] = key_out_inv_state and self.getSelValue('account.invoice', 'state', key_out_inv_state) or ''
+        return lines
+
+    def _get_report_lines(self, report):
+        """
+        Returns all report lines as a list of dict
+        """
+        lines = []
+        if report.order_ids:
+            bg_obj = self.pool.get('memory.background.report')
+            bg_id = self.localcontext.get('background_id')
+            # first: retrieve raw data
+            sql_req = """
+                select
+                    so.name AS fo_number, cust.name as customer_name, coalesce(so.client_order_ref, '') as customer_reference,
+                    coalesce(po.name, '') as po_number, coalesce(sup.name, '') as supplier_name, in_iv.id as si,
+                    coalesce(in_iv.number, '') as si_number, coalesce(cast(in_ivl.line_number as varchar), '') as si_line_number, 
+                    coalesce(in_ivl.name, '') as si_line_description, coalesce(in_ivl.price_unit, 0) as si_line_unit_price,
+                    coalesce(in_ivl.quantity, 0) as si_line_quantity, coalesce(in_ivl_acc.code, '') as si_line_account_code,
+                    coalesce(in_ivl.price_subtotal, 0) as si_line_subtotal, coalesce(in_iv_curr.name, '') as si_currency,
+                    in_iv_curr.id as si_currency_id, in_iv.document_date as si_doc_date, in_iv.date_invoice as si_posting_date,
+                    coalesce(in_iv.state, '') as si_state,
+                    CASE WHEN (in_aml.corrected or in_aml.last_cor_was_only_analytic) = TRUE THEN 'X' ELSE '' END AS reverse_aji_si,
+                    so.state as fo_status, sol.state as fo_line_status, sol.line_number as fo_line_number,
+                    coalesce(prod.default_code, '') as product_code, coalesce(prod_t.name, '') as product_description,
+                    coalesce(sol.product_uom_qty, 0) as qty_ordered, prod_u.name as uom_ordered,
+                    coalesce((select sum(product_qty) from
+                        stock_move m1, stock_picking p1
+                        where
+                        p1.id = m1.picking_id and
+                        m1.state = 'done' and
+                        p1.type = 'out' and 
+                        (p1.subtype='standard' or
+                        p1.subtype='picking' and p1.dpo_out='t' or 
+                        p1.subtype='packing' and m1.pick_shipment_id is not null and m1.not_shipped='f') and
+                        m1.sale_line_id = sol.id
+                        group by m1.sale_line_id), 0) as qty_delivered,  
+                    CASE WHEN coalesce(out_picking.name, out_iv.name) IS NOT NULL 
+                        THEN coalesce(out_picking.name, out_iv.name) ELSE '' END AS transport_file,
+                    coalesce(out_picking.id, 0) as pick_id,
+                    out_iv.id as out_inv, coalesce(out_iv.number, '') as out_inv_number,
+                    coalesce(cast(out_ivl.line_number as varchar), '') as out_inv_line_number,
+                    coalesce(out_ivl.name, '') as out_inv_line_description, coalesce(out_ivl.price_unit, 0) as out_inv_line_unit_price,
+                    coalesce(out_ivl.quantity, 0) as out_inv_line_quantity, coalesce(out_ivl_acc.code, '') as out_inv_line_account_code,
+                    coalesce(out_ivl.price_subtotal, 0) as out_inv_line_subtotal, coalesce(out_iv_curr.name, '') as out_inv_currency,
+                    out_iv_curr.id as out_inv_currency_id, out_iv.document_date as out_inv_doc_date,
+                    out_iv.date_invoice as out_inv_posting_date,
+                    coalesce(out_iv.state, '') as out_inv_state,
+                    CASE WHEN (out_aml.corrected or out_aml.last_cor_was_only_analytic) = TRUE THEN 'X' ELSE '' END AS reverse_aji_out_inv
+                    from sale_order_line sol
+                    inner join sale_order so on so.id = sol.order_id
+                    left join purchase_order_line pol on pol.linked_sol_id = sol.id
+                    left join purchase_order po on po.id = pol.order_id
+                    -- avoid duplicates due to merge lines and/or refunds
+                    left join (
+                        select in_ivl_tmp.*, coalesce(in_ivl_tmp.order_line_id, invl_pol_rel.po_line_id) as pol_id
+                            from account_invoice_line in_ivl_tmp
+                            inner join account_invoice in_iv_tmp on in_iv_tmp.id = in_ivl_tmp.invoice_id
+                            left join inv_line_po_line_rel invl_pol_rel on invl_pol_rel.inv_line_id = in_ivl_tmp.id
+                        where
+                            (invl_pol_rel.inv_line_id is NULL or invl_pol_rel.inv_line_id = in_ivl_tmp.id and in_ivl_tmp.order_line_id is null)
+                            and in_iv_tmp.refunded_invoice_id is NULL
+                            -- main_purchase_id is used to retrieve invoices generated via DPO before they had the tag from_supply
+                            and (coalesce(in_iv_tmp.from_supply, 't')='t' or in_iv_tmp.main_purchase_id is not null)
+                    ) as in_ivl ON in_ivl.pol_id = pol.id
+                    left join account_invoice in_iv on in_iv.id = in_ivl.invoice_id
+                    left join account_move in_am on in_am.id = in_iv.move_id
+                    left join account_move_line in_aml on in_aml.invoice_line_id = in_ivl.id and in_aml.move_id = in_am.id
+                    left join account_invoice_line out_ivl on out_ivl.sale_order_line_id = sol.id
+                    left join account_invoice out_iv on out_iv.id = out_ivl.invoice_id
+                    left join stock_picking out_picking on out_picking.id = out_iv.picking_id
+                    left join account_move out_am on out_am.id = out_iv.move_id
+                    left join account_move_line out_aml on out_aml.invoice_line_id = out_ivl.id and out_aml.move_id = out_am.id
+                    left join res_partner cust on cust.id = so.partner_id
+                    left join res_partner sup on sup.id = po.partner_id
+                    left join account_account in_ivl_acc on in_ivl_acc.id = in_ivl.account_id
+                    left join account_account out_ivl_acc on out_ivl_acc.id = out_ivl.account_id
+                    left join res_currency in_iv_curr on in_iv_curr.id = in_iv.currency_id
+                    left join res_currency out_iv_curr on out_iv_curr.id = out_iv.currency_id
+                    left join product_product prod on prod.id = sol.product_id
+                    left join product_template prod_t on prod_t.id = prod.product_tmpl_id
+                    left join product_uom prod_u on prod_u.id = sol.product_uom  
+                where
+                    out_iv.refunded_invoice_id is NULL and
+                    -- from_supply is used to exclude IVO/STV generated via refund before refunded_invoice_id was used
+                    coalesce(out_iv.from_supply, 't')='t' and
+                    sol.state not in ('cancel', 'cancel_r') and
+                    so.id in %s
+                order by fo_number DESC, fo_line_number, si_number, si_line_number, out_inv_number, out_inv_line_number;
+            """
+            self.cr.execute(sql_req, (tuple(report.order_ids),))
+            lines = self.cr.dictfetchall()
+            if bg_id:
+                bg_obj.update_percent(self.cr, self.uid, bg_id, 0.50)
+            # second: process data if needed
+            lines = self._process_report_lines(lines)
+        return lines
+
+
+SpreadsheetReport('report.fo.follow.up.finance', 'fo.follow.up.finance.wizard',
+                  'addons/finance/report/fo_follow_up_finance_xls.mako', parser=fo_follow_up_finance)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/finance/report/fo_follow_up_finance_xls.mako'
--- bin/addons/finance/report/fo_follow_up_finance_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/finance/report/fo_follow_up_finance_xls.mako	2021-02-01 16:08:13 +0000
@@ -0,0 +1,565 @@
+<?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>Unifield</Author>
+  <LastAuthor>MSFUser</LastAuthor>
+  <Company>Medecins Sans Frontieres</Company>
+ </DocumentProperties>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>11640</WindowHeight>
+  <WindowWidth>15480</WindowWidth>
+  <WindowTopX>120</WindowTopX>
+  <WindowTopY>75</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+    <Style ss:ID="ssCell">
+        <Alignment ss:Vertical="Top" ss:WrapText="1"/>
+        <Font ss:Bold="1" />
+    </Style>
+    <Style ss:ID="ssCellBlue">
+        <Alignment ss:Vertical="Top" ss:WrapText="1"/>
+        <Font ss:Color="#0000FF" />
+    </Style>
+
+    <!-- File header -->
+    <Style ss:ID="big_header">
+        <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
+    </Style>
+    <Style ss:ID="file_header">
+        <Font ss:Size="9" />
+        <Interior ss:Color="#C0C0C0" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Line big header without background color -->
+    <Style ss:ID="line_big_header">
+        <Alignment ss:Vertical="Center" ss:Horizontal="Center" ss:WrapText="1"/>
+        <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#FF0000" ss:Bold="1"/>
+        <Interior/>
+    </Style>
+
+    <!-- Line big header with background color -->
+    <Style ss:ID="line_big_header_with_bg">
+        <Alignment ss:Vertical="Center" ss:Horizontal="Center" ss:WrapText="1"/>
+        <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#FF0000" ss:Bold="1"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Line header without background color -->
+    <Style ss:ID="line_header">
+        <Alignment ss:Vertical="Center" ss:Horizontal="Center" ss:WrapText="1"/>
+        <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font x:Family="Swiss" ss:Size="7" ss:Bold="1"/>
+        <Interior/>
+    </Style>
+
+    <!-- Line header with background color -->
+    <Style ss:ID="line_header_with_bg">
+        <Alignment ss:Vertical="Center" ss:Horizontal="Center" ss:WrapText="1"/>
+        <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font x:Family="Swiss" ss:Size="7" ss:Bold="1"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Lines -->
+    <Style ss:ID="line_left">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="line_left_with_bg">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+    </Style>
+    <Style ss:ID="line_left_green_with_bg">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#1A721A"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+    </Style>
+    <Style ss:ID="line_right">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="line_right_with_bg">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+     </Style>
+     <Style ss:ID="line_center">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+     </Style>
+     <Style ss:ID="line_center_with_bg">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+     </Style>
+     <Style ss:ID="line_left_date">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="[ENG][$-409]d\-mmm\-yyyy;@" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="line_left_date_fr">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="Short Date" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+
+    <Style ss:ID="short_date">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+        <NumberFormat ss:Format="[ENG][$-409]d\-mmm\-yyyy;@" />
+        <Font ss:Size="8" ss:Color="#0000FF" />
+    </Style>
+    <Style ss:ID="short_date_fr">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+        <NumberFormat ss:Format="Short Date" />
+        <Font ss:Size="8" ss:Color="#0000FF" />
+    </Style>
+
+    <Style ss:ID="line_left_grey">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+    </Style>
+    <Style ss:ID="line_right_grey">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+     <Style ss:ID="line_center_grey">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="line_left_date_grey">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="[ENG][$-409]d\-mmm\-yyyy;@" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+    </Style>
+    <Style ss:ID="line_left_date_grey_fr">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="Short Date" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Font ss:Size="8" ss:Color="#747474"/>
+    </Style>
+</Styles>
+
+<ss:Worksheet ss:Name="${_('FO Follow Up')|x}">
+% for o in objects:
+    <Table x:FullColumns="1" x:FullRows="1">
+
+        ## FO number
+        <Column ss:AutoFitWidth="1" ss:Width="170.0" />
+        ## Customer name
+        <Column ss:AutoFitWidth="1" ss:Width="170.0" />
+        ## Customer ref
+        <Column ss:AutoFitWidth="1" ss:Width="170.0" />
+        ## PO number
+        <Column ss:AutoFitWidth="1" ss:Width="170.0" />
+        ## Supplier name
+        <Column ss:AutoFitWidth="1" ss:Width="170.0" />
+        ## Supplier invoice number
+        <Column ss:AutoFitWidth="1" ss:Width="150.0" />
+        ## SI line number
+        <Column ss:AutoFitWidth="1" ss:Width="45.00"  />
+        ## SI line description
+        <Column ss:AutoFitWidth="1" ss:Width="300.00"  />
+        ## SI line unit price
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## SI line quantity
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## SI line expense account code
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## SI line sub total
+        <Column ss:AutoFitWidth="1" ss:Width="98.25"  />
+        ## SI currency
+        <Column ss:AutoFitWidth="1" ss:Width="54.75"  />
+        ## SI line sub total functional currency
+        <Column ss:AutoFitWidth="1" ss:Width="98.25"  />
+        ## SI status
+        <Column ss:AutoFitWidth="1" ss:Width="60.75" />
+        ## Reverse corresponding AJI? (SI)
+        <Column ss:AutoFitWidth="1" ss:Width="70.00"  />
+        ## FO status
+        <Column ss:AutoFitWidth="1" ss:Width="60.75" />
+        ## FO line status
+        <Column ss:AutoFitWidth="1" ss:Width="60.75" />
+        ## FO line number
+        <Column ss:AutoFitWidth="1" ss:Width="40.00"  />
+        ## Product code
+        <Column ss:AutoFitWidth="1" ss:Width="107.25" />
+        ## Product description
+        <Column ss:AutoFitWidth="1" ss:Width="239.25"  />
+        ## Qty ordered
+        <Column ss:AutoFitWidth="1" ss:Width="54.75"  />
+        ## UoM ordered
+        <Column ss:AutoFitWidth="1" ss:Width="54.75"  />
+        ## Qty delivered
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## Transport file
+        <Column ss:AutoFitWidth="1" ss:Width="130.0" />
+        ## STV/IVO number
+        <Column ss:AutoFitWidth="1" ss:Width="150.0" />
+        ## STV/IVO line number
+        <Column ss:AutoFitWidth="1" ss:Width="40.00"  />
+        ## STV/IVO line description
+        <Column ss:AutoFitWidth="1" ss:Width="300.00"  />
+        ## STV/IVO line unit price
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## STV/IVO line quantity
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## STV/IVO line expense account code
+        <Column ss:AutoFitWidth="1" ss:Width="68.25"  />
+        ## STV/IVO line sub total
+        <Column ss:AutoFitWidth="1" ss:Width="98.25"  />
+        ## STV/IVO currency
+        <Column ss:AutoFitWidth="1" ss:Width="54.75"  />
+        ## STV/IVO line sub total functional currency
+        <Column ss:AutoFitWidth="1" ss:Width="98.25"  />
+        ## STV/IVO status
+        <Column ss:AutoFitWidth="1" ss:Width="60.75" />
+        ## Reverse corresponding AJI? (STV/IVO)
+        <Column ss:AutoFitWidth="1" ss:Width="70.00"  />
+
+        <Row ss:Height="18">
+            <Cell ss:StyleID="big_header"><Data ss:Type="String">${_('FIELD ORDER FOLLOW-UP FINANCE')|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+        </Row>
+
+        <Row ss:Height="10"></Row>
+
+        ## WORKSHEET HEADER
+        <Row>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="1"><Data ss:Type="String">${_('Instance information')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="3"><Data ss:Type="String">${_('Request parameters')|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Name:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${o.company_id.instance_id.instance or '-'|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Partners:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue" ss:MergeAcross="2"><Data ss:Type="String">${', '.join([p.name for p in o.partner_ids]) or '-'|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Address:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${o.company_id.partner_id.name or '-'|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Date start:')|x}</Data></Cell>
+            % if isDate(o.start_date):
+                % if getLang() == 'fr_MF':
+                <Cell ss:StyleID="short_date_fr" ss:MergeAcross="2"><Data ss:Type="DateTime">${o.start_date|n}T00:00:00.000</Data></Cell>
+                % else:
+                <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${o.start_date|n}T00:00:00.000</Data></Cell>
+                % endif
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${o.company_id.partner_id.address[0].street or ''|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Date end:')|x}</Data></Cell>
+            % if isDate(o.end_date):
+                % if getLang() == 'fr_MF':
+                <Cell ss:StyleID="short_date_fr" ss:MergeAcross="2"><Data ss:Type="DateTime">${o.end_date|n}T00:00:00.000</Data></Cell>
+                % else:
+                <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${o.end_date|n}T00:00:00.000</Data></Cell>
+                % endif
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${o.company_id.partner_id.address[0].zip|x} ${o.company_id.partner_id.address[0].city|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Date of the request:')|x}</Data></Cell>
+            % if o.report_date and isDateTime(o.report_date):
+                % if getLang() == 'fr_MF':
+                <Cell ss:StyleID="short_date_fr" ss:MergeAcross="2"><Data ss:Type="DateTime">${o.report_date[0:10]|n}T${o.report_date[11:19]|n}.000</Data></Cell>
+                % else:
+                <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${o.report_date[0:10]|n}T${o.report_date[11:19]|n}.000</Data></Cell>
+                % endif
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+
+        <Row></Row>
+
+        <% is_intermission = context and context.get('is_intermission') %>
+        <Row>
+            <Cell ss:StyleID="line_big_header" ss:MergeAcross="2"><Data ss:Type="String">${_('ORDER INFORMATION')|x}</Data></Cell>
+            <Cell ss:StyleID="line_big_header_with_bg" ss:MergeAcross="12"><Data ss:Type="String">${_('DETAILS SUPPLIER INVOICES')|x}</Data></Cell>
+            <Cell ss:StyleID="line_big_header" ss:MergeAcross="7"><Data ss:Type="String">${_('DETAILS FIELD ORDERS')|x}</Data></Cell>
+            <Cell ss:StyleID="line_big_header_with_bg" ss:MergeAcross="11"><Data ss:Type="String">${is_intermission and _('DETAILS INTERMISSION VOUCHERS OUT') or _('DETAILS STOCK TRANSFER VOUCHERS')|x}</Data></Cell>
+        </Row>
+
+        <%
+            header_list = [
+                ('no_bg', _('FO number')),
+                ('no_bg', _('Customer name')),
+                ('no_bg', _('Customer ref')),
+                ('bg', _('PO number')),
+                ('bg', _('Supplier name')),
+                ('bg', _('Supplier invoice number')),
+                ('bg', _('SI line number')),
+                ('bg', _('SI line description')),
+                ('bg', _('SI line unit price')),
+                ('bg', _('SI line quantity')),
+                ('bg', _('SI line expense account code')),
+                ('bg', _('SI line sub total')),
+                ('bg', _('SI currency')),
+                ('bg', _('SI line sub total functional currency')),
+                ('bg', _('SI status')),
+                ('bg', _('Reverse corresponding AJI? (SI)')),
+                ('no_bg', _('FO status')),
+                ('no_bg', _('FO line status')),
+                ('no_bg', _('FO line number')),
+                ('no_bg', _('Product code')),
+                ('no_bg', _('Product description')),
+                ('no_bg', _('Qty ordered')),
+                ('no_bg', _('UoM ordered')),
+                ('no_bg', _('Qty delivered')),
+                ('bg', _('Transport file')),
+                ('bg', is_intermission and _('IVO number') or _('STV number')),
+                ('bg', is_intermission and _('IVO line number') or _('STV line number')),
+                ('bg', is_intermission and _('IVO line description') or _('STV line description')),
+                ('bg', is_intermission and _('IVO line unit price') or _('STV line unit price')),
+                ('bg', is_intermission and _('IVO line quantity') or _('STV line quantity')),
+                ('bg', is_intermission and _('IVO line expense account code') or _('STV line expense account code')),
+                ('bg', is_intermission and _('IVO line sub total') or _('STV line sub total')),
+                ('bg', is_intermission and _('IVO currency') or _('STV currency')),
+                ('bg', is_intermission and _('IVO line sub total functional currency') or _('STV line sub total functional currency')),
+                ('bg', is_intermission and _('IVO status') or _('STV status')),
+                ('bg', is_intermission and _('Reverse corresponding AJI? (IVO)') or _('Reverse corresponding AJI? (STV)')),
+            ]
+        %>
+        <Row>
+        % for h in header_list:
+            % if h[0] == 'bg':
+                <Cell ss:StyleID="line_header_with_bg">
+            % else:
+                <Cell ss:StyleID="line_header">
+            % endif
+            <Data ss:Type="String">${h[1]|x}</Data></Cell>
+        % endfor
+        </Row>
+
+        % for line in getReportLines(o):
+            <Row ss:Height="11.25">
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['fo_number']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['customer_name']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['customer_reference']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['po_number']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['supplier_name']|x}</Data></Cell>
+                % if line['si']:
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['si_number']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['si_line_number']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['si_line_description']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['si_line_unit_price']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['si_line_quantity']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['si_line_account_code']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['si_line_subtotal']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['si_currency']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['si_line_subtotal_fctal']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['si_state']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_center_with_bg"><Data ss:Type="String">${line['reverse_aji_si']|x}</Data></Cell>
+                % else:
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_center_with_bg"><Data ss:Type="String"></Data></Cell>
+                % endif
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['fo_status']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['fo_line_status']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['fo_line_number']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['product_code']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['product_description']|x}</Data></Cell>
+                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line['qty_ordered']|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line['uom_ordered']|x}</Data></Cell>
+                <Cell ss:StyleID="line_right"><Data ss:Type="Number">${line['qty_delivered']|x}</Data></Cell>
+                 % if line['is_delivered']:
+                    <Cell ss:StyleID="line_left_green_with_bg"><Data ss:Type="String">${line['transport_file']|x}</Data></Cell>
+                % else:
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['transport_file']|x}</Data></Cell>
+                % endif
+                % if line['out_inv']:
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['out_inv_number']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['out_inv_line_number']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['out_inv_line_description']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['out_inv_line_unit_price']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['out_inv_line_quantity']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['out_inv_line_account_code']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['out_inv_line_subtotal']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['out_inv_currency']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_right_with_bg"><Data ss:Type="Number">${line['out_inv_line_subtotal_fctal']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String">${line['out_inv_state']|x}</Data></Cell>
+                    <Cell ss:StyleID="line_center_with_bg"><Data ss:Type="String">${line['reverse_aji_out_inv']|x}</Data></Cell>
+                % else:
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_left_with_bg"><Data ss:Type="String"></Data></Cell>
+                    <Cell ss:StyleID="line_center_with_bg"><Data ss:Type="String"></Data></Cell>
+                % endif
+            </Row>
+        % endfor
+
+    </Table>
+% endfor
+
+<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+    <PageSetup>
+        <Layout x:Orientation="Landscape"/>
+        <Footer x:Data="Page &amp;P of &amp;N"/>
+    </PageSetup>
+    <Selected/>
+    <FreezePanes/>
+    <FrozenNoSplit/>
+    <SplitHorizontal>10</SplitHorizontal>
+    <TopRowBottomPane>10</TopRowBottomPane>
+    <SplitVertical>1</SplitVertical>
+    <LeftColumnRightPane>1</LeftColumnRightPane>
+    <ActivePane>0</ActivePane>
+    <Panes>
+        <Pane>
+            <Number>3</Number>
+            <ActiveRow>17</ActiveRow>
+        </Pane>
+    </Panes>
+    <ProtectObjects>False</ProtectObjects>
+    <ProtectScenarios>False</ProtectScenarios>
+</WorksheetOptions>
+<AutoFilter x:Range="R10C1:R10C36" xmlns="urn:schemas-microsoft-com:office:excel">
+</AutoFilter>
+</ss:Worksheet>
+</Workbook>

=== modified file 'bin/addons/finance/wizard/__init__.py'
--- bin/addons/finance/wizard/__init__.py	2014-03-14 15:47:48 +0000
+++ bin/addons/finance/wizard/__init__.py	2021-02-01 16:08:13 +0000
@@ -1,1 +1,2 @@
 import account_report_partner_balance_tree  # uf-1715
+import fo_follow_up_finance_wizard

=== added file 'bin/addons/finance/wizard/fo_follow_up_finance_wizard.py'
--- bin/addons/finance/wizard/fo_follow_up_finance_wizard.py	1970-01-01 00:00:00 +0000
+++ bin/addons/finance/wizard/fo_follow_up_finance_wizard.py	2021-02-01 16:08:13 +0000
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2020 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+import time
+
+
+class fo_follow_up_finance_wizard(osv.osv_memory):
+    _name = 'fo.follow.up.finance.wizard'
+    _rec_name = 'report_date'
+    _order = 'report_date desc'
+
+    _columns = {
+        'start_date': fields.date(string='Start date'),
+        'end_date': fields.date(string='End date'),
+        'partner_ids': fields.many2many('res.partner', 'fo_follow_up_wizard_partner_rel', 'wizard_id', 'partner_id', 'Partners'),
+        'order_id': fields.many2one('sale.order', string='Order Ref.'),
+        'order_ids': fields.text(string='Orders', readonly=True),  # don't use many2many to avoid memory usage issue
+        'report_date': fields.datetime(string='Date of the export', readonly=True),
+        'company_id': fields.many2one('res.company', string='Company', readonly=True),
+    }
+
+    _defaults = {
+        'report_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'company_id': lambda self, cr, uid, ids, c={}: self.pool.get('res.users').browse(cr, uid, uid).company_id.id,
+    }
+
+    def get_values(self, cr, uid, ids, context=None):
+        """
+        Retrieves the data according to the values in the wizard
+        """
+        fo_obj = self.pool.get('sale.order')
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for wizard in self.browse(cr, uid, ids, context=context):
+            fo_ids = []
+            if context.get('selected_inv_ids'):
+                sql_req = """
+                    SELECT DISTINCT(fo.id)
+                    FROM sale_order fo
+                    INNER JOIN sale_order_line fol ON fol.order_id = fo.id
+                    INNER JOIN account_invoice_line inv_l ON inv_l.sale_order_line_id = fol.id
+                    WHERE inv_l.invoice_id IN %s;
+                """
+                cr.execute(sql_req, (tuple(context['selected_inv_ids']),))
+                fo_ids = [x[0] for x in cr.fetchall()]
+            else:
+                fo_domain = []
+                context_ivo = context.get('type', False) == 'out_invoice' and context.get('journal_type', False) == 'intermission' and \
+                    context.get('is_intermission', False) and context.get('intermission_type', False) == 'out'
+                context_stv = context.get('type', False) == 'out_invoice' and context.get('journal_type', False) == 'sale' and \
+                    not context.get('is_debit_note', False)
+                if context_ivo:
+                    fo_domain.append(('partner_type', '=', 'intermission'))
+                elif context_stv:
+                    fo_domain.append(('partner_type', '=', 'section'))
+                if wizard.start_date:
+                    fo_domain.append(('date_order', '>=', wizard.start_date))
+                if wizard.end_date:
+                    fo_domain.append(('date_order', '<=', wizard.end_date))
+                if wizard.partner_ids:
+                    fo_domain.append(('partner_id', 'in', [p.id for p in wizard.partner_ids]))
+                if wizard.order_id:
+                    fo_domain.append(('id', '=', wizard.order_id.id))
+                fo_ids = fo_obj.search(cr, uid, fo_domain, context=context)
+            if not fo_ids:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('No field orders found.'),
+                )
+            self.pool.get('sale.followup.multi.wizard')._check_max_line_number(cr, fo_ids)
+            self.write(cr, uid, [wizard.id], {'order_ids': fo_ids}, context=context)
+        return True
+
+    def print_excel(self, cr, uid, ids, context=None):
+        """
+        Prints the report in Excel format.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        self.get_values(cr, uid, ids, context=context)
+        background_id = self.pool.get('memory.background.report').create(cr, uid, {
+            'file_name': 'FO Follow-up Finance',
+            'report_name': 'fo.follow.up.finance',
+        }, context=context)
+        context['background_id'] = background_id
+        context['background_time'] = 3
+        data = {'ids': ids, 'context': context}
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'fo.follow.up.finance',
+            'datas': data,
+            'context': context,
+        }
+
+
+fo_follow_up_finance_wizard()

=== added file 'bin/addons/finance/wizard/fo_follow_up_finance_wizard_view.xml'
--- bin/addons/finance/wizard/fo_follow_up_finance_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/finance/wizard/fo_follow_up_finance_wizard_view.xml	2021-02-01 16:08:13 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- FO Follow-Up finance / Wizard -->
+        <record id="fo_follow_up_finance_wizard_form_view" model="ir.ui.view">
+            <field name="name">fo.follow.up.finance.wizard.form.view</field>
+            <field name="model">fo.follow.up.finance.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="FO Follow-up Finance">
+                    <separator colspan="4" string="Request parameters" />
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="partner_ids" domain="[('customer', '=', True),
+                                                       ('partner_type', '=', context.get('is_intermission') and 'intermission' or 'section')]">
+                        <tree>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <field name="partner_type"/>
+                        </tree>
+                    </field>
+                    <field name="order_id" domain="[('partner_type', '=', context.get('is_intermission') and 'intermission' or 'section')]"/>
+                    <button name="print_excel" string="Excel report" icon="gtk-print" type="object" colspan="4" />
+                </form>
+            </field>
+        </record>
+
+        <!-- FO Follow-Up finance / Entry Menu -->
+        <record id="action_fo_follow_up_finance_wizard_menu" model="ir.actions.act_window">
+            <field name="name">FO Follow-up Finance</field>
+            <field name="res_model">fo.follow.up.finance.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+             <field name="empty_ids">1</field>
+        </record>
+        <record model="ir.values" id="action_fo_follow_up_finance_wizard_values">
+            <field name="object" eval="1" />
+            <field name="name">fo_follow_up_finance</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_fo_follow_up_finance_wizard_menu'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+            <field name="sequence" eval="98"/>
+        </record>
+
+        <!-- Invoice lines follow-up -->
+        <record id="action_invoice_lines_follow_up" model="ir.actions.server">
+            <field name="name">Invoice lines follow-up</field>
+            <field name="model_id" ref="model_account_invoice"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.get_invoice_lines_follow_up(context=context)</field>
+        </record>
+        <record id="ir_invoice_lines_follow_up" model="ir.values">
+            <field name="key2">client_print_multi</field>
+            <field name="model">account.invoice</field>
+            <field name="name">invoice_lines_follow_up</field>
+            <field eval="'ir.actions.server,%d'%action_invoice_lines_follow_up" name="value"/>
+            <field eval="True" name="object"/>
+            <field name="sequence" eval="99"/>
+        </record>
+
+        <!-- FO Follow-Up finance / Report -->
+        <report id="fo_follow_up_finance"
+            string="FO Follow-up Finance"
+            model="account.invoice"
+            name="fo.follow.up.finance"
+            target_filename="Follow Up_%(year)s%(month)s%(day)s"
+            file="finance/report/fo_follow_up_finance_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"/>
+
+    </data>
+</openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-01-28 10:07:03 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-02-01 16:08:13 +0000
@@ -231,7 +231,7 @@
 msgid "Card lines"
 msgstr "Card lines"
 
-#. modules: msf_supply_doc_export, sales_followup
+#. modules: msf_supply_doc_export, sales_followup, finance
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:897
 #: report:po.follow.up_rml:0
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:289
@@ -239,6 +239,7 @@
 #: report:ir.follow.up.location.report_pdf:0
 #: report:sales.follow.up.multi.report_pdf:0
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:886
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:354
 msgid "Qty ordered"
 msgstr "Qté commandée"
 
@@ -2180,13 +2181,14 @@
 msgid "PURCHASE ORDER Track Changes report"
 msgstr "BON DE COMMANDE RAPPORT DE SUIVI DES CHANGEMENTS"
 
-#. modules: sales_followup, purchase_followup
+#. modules: sales_followup, purchase_followup, finance
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:195
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:246
 #: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:187
 #: report:ir.follow.up.location.report_pdf:0
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:247
 #: report:sales.follow.up.multi.report_pdf:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:301
 msgid "Date end:"
 msgstr "Date de fin:"
 
@@ -13044,11 +13046,12 @@
 msgid "Select the lines to be split; the wizard will create a new invoice and adjust the original one."
 msgstr "Sélectionner les lignes à fractionner, l'assistant créera une nouvelle facture et ajustera l'originale"
 
-#. module: sales_followup
+#. modules: sales_followup, finance
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:289
 #: report:sales.follow.up.multi.report_pdf:0
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:291
 #: report:ir.follow.up.location.report_pdf:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:356
 msgid "Qty delivered"
 msgstr "Qté livrée"
 
@@ -20320,11 +20323,12 @@
 msgid "You receive heat sensitive products, please refer to the appropriate procedure."
 msgstr "Vous recevez des produits sensibles à la chaleur, merci de vous référer à la procédure appropriée."
 
-#. modules: purchase, sourcing, sale, product_attributes
+#. modules: purchase, sourcing, sale, product_attributes, finance
 #: field:purchase.order.line,name:0
 #: field:sale.order.line,name:0
 #: field:sale.order.line,product_name:0
 #: report:addons/product_attributes/report/standard_price_track_changes.mako:77
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:353
 msgid "Product description"
 msgstr "Description produit"
 
@@ -26535,7 +26539,7 @@
 msgid "Applicable Code (if type=code)"
 msgstr "Code Applicable (si type=code)"
 
-#. modules: sales_followup, sale, purchase_followup, stock, msf_supply_doc_export
+#. modules: sales_followup, sale, purchase_followup, stock, msf_supply_doc_export, finance
 #: view:po.follow.up:0
 #: view:po.track.changes.wizard:0
 #: view:sale.loan.stock.moves:0
@@ -26547,6 +26551,7 @@
 #: view:products.situation.report:0
 #: view:supplier.performance.wizard:0
 #: view:stock.delivery.wizard:0
+#: view:fo.follow.up.finance.wizard:0
 msgid "Excel report"
 msgstr "Rapport Excel"
 
@@ -29411,6 +29416,7 @@
 #. modules: finance, stock_override
 #: report:cash.request.export:0
 #: report:destruction.location:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:276
 msgid "Name:"
 msgstr "Nom :"
 
@@ -32358,6 +32364,7 @@
 #: field:tender,company_id:0
 #: field:ir.followup.location.wizard,company_id:0
 #: field:stock.reception.wizard,company_id:0
+#: field:fo.follow.up.finance.wizard,company_id:0
 msgid "Company"
 msgstr "Société"
 
@@ -34341,7 +34348,7 @@
 msgid "Shipment Date:"
 msgstr "Shipment Date:"
 
-#. modules: sales_followup, sync_client, sale, mission_stock, msf_doc_import, purchase_followup, account_override, stock
+#. modules: sales_followup, sync_client, sale, mission_stock, msf_doc_import, purchase_followup, account_override, stock, finance
 #: field:msr_in_progress,start_date:0
 #: field:abstract.wizard.import,start_date:0
 #: field:wizard.import.batch,start_date:0
@@ -34354,6 +34361,7 @@
 #: field:ir.track.changes.wizard,start_date:0
 #: field:integrity.finance.wizard,date_from:0
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:178
+#: field:fo.follow.up.finance.wizard,start_date:0
 msgid "Start date"
 msgstr "Date de début"
 
@@ -36554,6 +36562,7 @@
 #: field:product.template,seller_ids:0
 #: model:ir.ui.menu,name:useability_dashboard_and_menu.menu_partner
 #: model:ir.actions.act_window,name:msf_partner.partner_normal_action
+#: field:fo.follow.up.finance.wizard,partner_ids:0
 msgid "Partners"
 msgstr "Partenaires"
 
@@ -39180,13 +39189,14 @@
 msgid "Start configuration of internal partner..."
 msgstr "Start configuration of internal partner..."
 
-#. modules: sales_followup, purchase_followup
+#. modules: sales_followup, purchase_followup, finance
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:213
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:257
 #: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:205
 #: report:ir.follow.up.location.report_pdf:0
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:258
 #: report:sales.follow.up.multi.report_pdf:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:316
 msgid "Date of the request:"
 msgstr "Date de la requête:"
 
@@ -43559,7 +43569,7 @@
 msgid "Reordering Mode"
 msgstr "Mode de Réapprovisionnement"
 
-#. modules: msf_doc_import, sale, sales_followups, account_override, stock, stock_schedule,sales_followup,purchase_followup
+#. modules: msf_doc_import, sale, account_override, stock, stock_schedule, sales_followup, purchase_followup, finance
 #: field:abstract.wizard.import,end_date:0
 #: field:wizard.import.batch,end_date:0
 #: field:sale.donation.stock.moves,end_date:0
@@ -43574,6 +43584,7 @@
 #: field:po.track.changes.wizard,end_date:0
 #: field:sale.loan.stock.moves,end_date:0
 #: field:ir.track.changes.wizard,end_date:0
+#: field:fo.follow.up.finance.wizard,end_date:0
 msgid "End date"
 msgstr "Date de fin"
 
@@ -47400,13 +47411,14 @@
 msgid "TVA :"
 msgstr "TVA :"
 
-#. modules: sourcing, sale, product_attributes, procurement_cycle
+#. modules: sourcing, sale, product_attributes, procurement_cycle, finance
 #: field:sale.report,product_code:0
 #: field:sale.order.line,product_code:0
 #: report:addons/product_attributes/report/standard_price_track_changes.mako:69
 #: report:addons/procurement_cycle/report/replenishment_order_calc.mako:408
 #: report:addons/procurement_cycle/report/replenishment_product_list.mako:124
 #: report:addons/procurement_cycle/report/replenishment_segment.mako:368
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:352
 msgid "Product code"
 msgstr "Code Produit"
 
@@ -47966,9 +47978,10 @@
 msgid "SÃO TOMÉ AND PRÍNCIPE DOBRA"
 msgstr "SÃO TOMÉ AND PRÍNCIPE DOBRA"
 
-#. module: sales_followup
+#. modules: sales_followup, finance
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:294
 #: report:sales.follow.up.multi.report_pdf:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:357
 msgid "Transport file"
 msgstr "Fichier Transport"
 
@@ -47999,7 +48012,7 @@
 msgid "Original Qty for Partial process - only for sync and partial processed line"
 msgstr "Original Qty for Partial process - only for sync and partial processed line"
 
-#. modules: sales_followup, purchase_followup, sale, stock, msf_supply_doc_export
+#. modules: sales_followup, purchase_followup, sale, stock, msf_supply_doc_export, finance
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:178
 #: view:po.track.changes.wizard:0
 #: view:sale.donation.stock.moves:0
@@ -48014,6 +48027,8 @@
 #: view:stock.expired.damaged.report:0
 #: view:supplier.performance.wizard:0
 #: view:stock.delivery.wizard:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:273
+#: view:fo.follow.up.finance.wizard:0
 msgid "Request parameters"
 msgstr "Paramètres de la requête"
 
@@ -52960,11 +52975,12 @@
 msgid "In months. Define the time while the stock is not negative but should be replenished. Time used to compute the quantity of products to order according to the monthly consumption."
 msgstr "En mois. Défini le temps durant lequel le stock n'est pas négatif, mais doit être réapprovisionné. Temps utilisé pour calculer la quantité de produits à commander en fonction de la consommation mensuelle."
 
-#. module: sales_followup
+#. modules: sales_followup, finance
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:235
 #: report:ir.follow.up.location.report_pdf:0
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:236
 #: report:sales.follow.up.multi.report_pdf:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:286
 msgid "Date start:"
 msgstr "Date de début:"
 
@@ -56546,9 +56562,10 @@
 msgid "Item"
 msgstr "Art."
 
-#. module: sales_followup
+#. modules: sales_followup, finance
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:284
 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:124
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:186
 msgid "FO Follow Up"
 msgstr "Suivi CdT"
 
@@ -67356,13 +67373,14 @@
 msgid "Create and manage the companies that will be managed by OpenERP from here. Shops or subsidiaries can be created and maintained from here."
 msgstr "Créer et gérer les sociétés qui seront gérées par OpenERP à partir d'ici. Les magasins ou sous-divisions pourront être créés ou maintenus à partir d'ici."
 
-#. modules: sales_followup, purchase_followup
+#. modules: sales_followup, purchase_followup, finance
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:192
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:232
 #: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:184
 #: report:ir.follow.up.location.report_pdf:0
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:233
 #: report:sales.follow.up.multi.report_pdf:0
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:283
 msgid "Address:"
 msgstr "Adresse:"
 
@@ -68698,11 +68716,12 @@
 msgid "Register line state"
 msgstr "Register line state"
 
-#. module: sales_followup, sale
+#. modules: sales_followup, sale, finance
 #: field:ir.followup.location.wizard,order_id:0
 #: field:ir.track.changes.wizard,order_id:0
 #: field:sale.followup.multi.wizard,order_id:0
 #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:133
+#: field:fo.follow.up.finance.wizard,order_id:0
 msgid "Order Ref."
 msgstr "Réf Commande"
 
@@ -70936,10 +70955,11 @@
 msgid "user.access.results.users.line"
 msgstr "user.access.results.users.line"
 
-#. modules: purchase, product, sales_followup
+#. modules: purchase, product, sales_followup, finance
 #: field:product.product,partner_ref:0
 #: view:purchase.order.line:0
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:278
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:335
 msgid "Customer ref"
 msgstr "Réf. Client"
 
@@ -76758,13 +76778,19 @@
 msgid "Display PO"
 msgstr "Affichage BC"
 
-#. modules: purchase_msf, purchase_override, msf_supply_doc_export
+#. modules: purchase_msf, purchase_override, msf_supply_doc_export, finance
 #: field:purchase.order.line,supplier_name:0
 #: field:purchase.order.merged.line,supplier_name:0
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:195
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:337
 msgid "Supplier name"
 msgstr "Nom Fournisseur"
 
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:334
+msgid "Customer name"
+msgstr "Nom Client"
+
 #. module: account_period_closing_level
 #: selection:account.period.create,fiscalyear:0
 msgid "Next FY"
@@ -78701,10 +78727,11 @@
 msgid "Mauritania"
 msgstr "Mauritanie"
 
-#. modules: sales_followup, base
+#. modules: sales_followup, base, finance
 #: model:ir.ui.menu,name:base.menu_base_partner
 #: field:ir.followup.location.wizard,order_ids:0
 #: field:sale.followup.multi.wizard,order_ids:0
+#: field:fo.follow.up.finance.wizard,order_ids:0
 msgid "Orders"
 msgstr "Commandes"
 
@@ -86323,11 +86350,12 @@
 msgid "Template file"
 msgstr "Fichier modèle"
 
-#. modules: sales_followup, purchase_followup
+#. modules: sales_followup, purchase_followup, finance
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:220
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:221
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:176
 #: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:168
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:271
 msgid "Instance information"
 msgstr "Informations sur l'instance"
 
@@ -89655,9 +89683,10 @@
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#. modules: sales_followup, msf_outgoing, specific_rules
+#. modules: sales_followup, msf_outgoing, specific_rules, finance
 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:290
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:288
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:355
 msgid "UoM ordered"
 msgstr "UdM commandée"
 
@@ -98135,10 +98164,11 @@
 msgid "Note type"
 msgstr "Type de note"
 
-#. modules: purchase, analytic_distribution, msf_doc_import
+#. modules: purchase, analytic_distribution, msf_doc_import, finance
 #: field:account.commitment.line,purchase_order_line_ids:0
 #: view:purchase.order.line:0
 #: field:wizard.import.po,line_ids:0
+#: field:account.invoice.line,purchase_order_line_ids:0
 msgid "Purchase Order Lines"
 msgstr "Lignes Bon de Commande"
 
@@ -108669,13 +108699,15 @@
 msgid "Ship #"
 msgstr "Numéro d'Expé."
 
-#. module: account
+#. modules: account, finance
 #: report:addons/account/report/invoice_excel_export.mako:81
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:333
 msgid "FO number"
 msgstr "Numéro de la CdT"
 
-#. module: account
+#. modules: account, finance
 #: report:addons/account/report/invoice_excel_export.mako:82
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:336
 msgid "PO number"
 msgstr "Numéro du BC"
 
@@ -111248,6 +111280,7 @@
 #, python-format
 msgid "PO %s created by duplication: Order Type changed from DPO to Regular"
 msgstr "BdC %s créé par duplication: Type de Commande modifié de BC Direct à Normal"
+<<<<<<< TREE
 
 #. module: kit
 #: view:kit.creation:0
@@ -111263,3 +111296,262 @@
 #: view:kit.creation:0
 msgid "Remove Availability"
 msgstr "Enlever la Disponibilité"
+=======
+
+#. module: account
+#: code:addons/account/invoice.py:2157
+#, python-format
+msgid "IVO lines follow-up"
+msgstr "Suivi Lignes Bons Interm. OUT"
+
+#. module: account
+#: code:addons/account/invoice.py:2159
+#, python-format
+msgid "STV lines follow-up"
+msgstr "Suivi Lignes Bons Clients"
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:1682
+#, python-format
+msgid "Please select at least one record!"
+msgstr "Veuillez sélectionner au moins un enregistrement !"
+
+#. module: finance
+#: code:addons/finance/wizard/fo_follow_up_finance_wizard.py:81
+#, python-format
+msgid "No field orders found."
+msgstr "Pas de commandes de terrain trouvées."
+
+#. modules: register_accounting, finance
+#: help:account.invoice.line,purchase_order_line_ids:0
+#: help:wizard.account.invoice.line,purchase_order_line_ids:0
+msgid "Used in case of merged invoice lines"
+msgstr "Utilisé en cas de lignes de facture fusionnées"
+
+#. module: finance
+#: view:fo.follow.up.finance.wizard:0
+#: model:ir.actions.act_window,name:finance.action_fo_follow_up_finance_wizard_menu
+#: model:ir.actions.report.xml,name:finance.fo_follow_up_finance
+msgid "FO Follow-up Finance"
+msgstr "Suivi Commande Terrain Finance"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:264
+msgid "FIELD ORDER FOLLOW-UP FINANCE"
+msgstr "SUIVI COMMANDE TERRAIN FINANCE"
+
+#. module: finance
+#: field:fo.follow.up.finance.wizard,report_date:0
+msgid "Date of the export"
+msgstr "Date de l'export"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:349
+msgid "FO status"
+msgstr "Statut CdT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:350
+msgid "FO line status"
+msgstr "Statut ligne CdT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:367
+msgid "STV status"
+msgstr "Statut Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:367
+msgid "IVO status"
+msgstr "Statut Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:347
+msgid "SI status"
+msgstr "Statut Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:368
+msgid "Reverse corresponding AJI? (STV)"
+msgstr "Ligne Analytique Correspondante Contrepassée ? (Bon Client)"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:368
+msgid "Reverse corresponding AJI? (IVO)"
+msgstr "Ligne Analytique Correspondante Contrepassée ? (Bon Interm. OUT)"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:348
+msgid "Reverse corresponding AJI? (SI)"
+msgstr "Ligne Analytique Correspondante Contrepassée ? (Fact. Fourniss.)"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:364
+msgid "STV line sub total"
+msgstr "Sous-total ligne Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:364
+msgid "IVO line sub total"
+msgstr "Sous-total ligne Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:344
+msgid "SI line sub total"
+msgstr "Sous-total ligne Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:366
+msgid "STV line sub total functional currency"
+msgstr "Sous-total ligne Bon Client en devise fonctionnelle"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:366
+msgid "IVO line sub total functional currency"
+msgstr "Sous-total ligne Bon Interm. OUT en devise fonctionnelle"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:346
+msgid "SI line sub total functional currency"
+msgstr "Sous-total ligne Fact. Fourniss. en devise fonctionnelle"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:358
+msgid "STV number"
+msgstr "Num. Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:358
+msgid "IVO number"
+msgstr "Num. Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:338
+msgid "Supplier invoice number"
+msgstr "Num. Facture Fournisseur"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:351
+msgid "FO line number"
+msgstr "Num. ligne CdT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:359
+msgid "STV line number"
+msgstr "Num. ligne Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:359
+msgid "IVO line number"
+msgstr "Num. ligne Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:339
+msgid "SI line number"
+msgstr "Num. ligne Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:360
+msgid "STV line description"
+msgstr "Description ligne Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:360
+msgid "IVO line description"
+msgstr "Description ligne Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:340
+msgid "SI line description"
+msgstr "Description ligne Fact. Fournisseur"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:362
+msgid "STV line quantity"
+msgstr "Quantité ligne Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:362
+msgid "IVO line quantity"
+msgstr "Quantité ligne Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:342
+msgid "SI line quantity"
+msgstr "Quantité ligne Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:361
+msgid "STV line unit price"
+msgstr "Prix Unitaire ligne Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:361
+msgid "IVO line unit price"
+msgstr "Prix Unitaire ligne Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:341
+msgid "SI line unit price"
+msgstr "Prix Unitaire ligne Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:363
+msgid "STV line expense account code"
+msgstr "Code Compte de Charge ligne Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:363
+msgid "IVO line expense account code"
+msgstr "Code Compte de Charge ligne Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:343
+msgid "SI line expense account code"
+msgstr "Code Compte de Charge ligne Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:365
+msgid "STV currency"
+msgstr "Devise Bon Client"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:365
+msgid "IVO currency"
+msgstr "Devise Bon Interm. OUT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:345
+msgid "SI currency"
+msgstr "Devise Fact. Fourniss."
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:279
+msgid "Partners:"
+msgstr "Partenaires :"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:407
+msgid "ORDER INFORMATION"
+msgstr "INFORMATION COMMANDE"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:408
+msgid "DETAILS SUPPLIER INVOICES"
+msgstr "DÉTAILS FACTURES FOURNISSEUR"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:409
+msgid "DETAILS FIELD ORDERS"
+msgstr "DÉTAILS COMMANDES DE TERRAIN"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:410
+msgid "DETAILS STOCK TRANSFER VOUCHERS"
+msgstr "DÉTAILS BONS CLIENT"
+
+#. module: finance
+#: report:addons/finance/report/fo_follow_up_finance_xls.mako:410
+msgid "DETAILS INTERMISSION VOUCHERS OUT"
+msgstr "DÉTAILS BONS INTERMISSION OUT"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/product_attributes/product_attributes.py'
=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2021-01-06 15:21:47 +0000
+++ bin/addons/purchase/purchase_order.py	2021-02-01 16:08:13 +0000
@@ -1535,6 +1535,7 @@
                     'company_id': o.company_id.id,
                     'main_purchase_id': o.id,
                     'purchase_ids': [(4, o.id)],
+                    'from_supply': True,
                 }
 
                 if o.analytic_distribution_id:

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2020-12-14 16:49:10 +0000
+++ bin/addons/purchase/purchase_order_line.py	2021-02-01 16:08:13 +0000
@@ -1270,7 +1270,7 @@
             self.pool.get('product.product')._get_restriction_error(cr, uid, [pol.product_id.id],
                                                                     {'partner_id': pol.order_id.partner_id.id}, context=context)
 
-        default.update({'state': 'draft', 'move_ids': [], 'invoiced': 0, 'invoice_lines': [], 'commitment_line_ids': []})
+        default.update({'state': 'draft', 'move_ids': [], 'invoiced': 0, 'invoice_lines': [], 'commitment_line_ids': [], })
 
         for field in ['origin', 'move_dest_id', 'original_product', 'original_qty', 'original_price', 'original_uom', 'original_currency_id', 'modification_comment', 'sync_linked_sol', 'created_by_vi_import', 'external_ref']:
             if field not in default:

=== modified file 'bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py'
--- bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py	2019-07-26 15:38:38 +0000
+++ bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py	2021-02-01 16:08:13 +0000
@@ -138,6 +138,25 @@
 
         return state_domain
 
+    def _check_max_line_number(self, cr, fo_ids):
+        """
+        Blocks report generation with an error message in case there are too many FO lines to handle.
+        """
+        cr.execute("""SELECT COUNT(id) FROM sale_order_line WHERE order_id IN %s""", (tuple(fo_ids),))
+        nb_lines = 0
+        for x in cr.fetchall():
+            nb_lines = x[0]
+        # Parameter to define the maximum number of lines. For a custom number:
+        # "INSERT INTO ir_config_parameter (key, value) VALUES ('FO_FOLLOWUP_MAX_LINE', 'chosen_number');"
+        # Or update the existing one
+        config_line = self.pool.get('ir.config_parameter').get_param(cr, 1, 'FO_FOLLOWUP_MAX_LINE')
+        if config_line:
+            max_line = int(config_line)
+        else:
+            max_line = 5000
+        if nb_lines > max_line:
+            raise osv.except_osv(_('Error'), _('The requested report is too heavy to generate: requested %d lines, maximum allowed %d. '
+                                               'Please apply further filters so that report can be generated.') % (nb_lines, max_line))
 
     def get_values(self, cr, uid, ids, context=None):
         '''
@@ -178,22 +197,7 @@
                         _('No data found with these parameters'),
                     )
 
-                cr.execute("""SELECT COUNT(id) FROM sale_order_line WHERE order_id IN %s""", (tuple(fo_ids),))
-                nb_lines = 0
-                for x in cr.fetchall():
-                    nb_lines = x[0]
-
-                # Parameter to define the maximum number of lines. For a custom number:
-                # "INSERT INTO ir_config_parameter (key, value) VALUES ('FOLLOWUP_MAX_LINE', 'chosen_number');"
-                # Or update the existing one
-                config_line = self.pool.get('ir.config_parameter').get_param(cr, 1, 'FO_FOLLOWUP_MAX_LINE')
-                if config_line:
-                    max_line = int(config_line)
-                else:
-                    max_line = 5000
-
-                if nb_lines > max_line:
-                    raise osv.except_osv(_('Error'), _('The requested report is too heavy to generate: requested %d lines, maximum allowed %d. Please apply further filters so that report can be generated.') % (nb_lines, max_line))
+                self._check_max_line_number(cr, fo_ids)
 
             self.write(cr, uid, [wizard.id], {'order_ids': fo_ids}, context=context)