Merge lp:~unifield-team/unifield-server/us-1168-int into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2016-10-28 14:28:19 +0000
@@ -160,6 +160,7 @@
         for l in self.pool.get('purchase.order').browse(cr, uid, ids[0], context=context).order_line:
             export_line_obj.create(cr, uid, {'po_line_id': l.id,
                                              'in_line_number': l.line_number,
+                                             'in_ext_ref': l.external_ref,
                                              'simu_id': export_id}, context=context)
 
         return {'type': 'ir.actions.act_window',
@@ -219,8 +220,10 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        datas = {}
-        datas['ids'] = ids
+        datas = {
+            'ids': ids,
+            'need_ad': context.get('need_ad', True),
+        }
         file_name = self.export_get_file_name(cr, uid, ids, prefix='POV',
             context=context)
         if file_name:
@@ -244,8 +247,10 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        datas = {}
-        datas['ids'] = ids
+        datas = {
+            'ids': ids,
+            'need_ad': context.get('need_ad', True),
+        }
         file_name = self.export_get_file_name(cr, uid, ids, prefix='POV',
             context=context)
         if file_name:
@@ -493,21 +498,38 @@
 
     _columns = {
         'order_id': fields.many2one('purchase.order', string='Purchase Order', required=True),
+        'need_ad': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+            ],
+            string='Export AD',
+            required=True,
+        ),
         'file_type': fields.selection([('excel', 'Excel file'),
                                        ('xml', 'XML file')], string='File type', required=True),
     }
 
+    _defaults = {
+        'need_ad': 'yes',
+    }
+
     def export_file(self, cr, uid, ids, context=None):
         '''
         Launch the good method to download the good file
         '''
         order_obj = self.pool.get('purchase.order')
 
+        if context is None:
+            context = {}
+
         if isinstance(ids, (int, long)):
             ids = [ids]
 
         wiz = self.browse(cr, uid, ids[0], context=context)
 
+        context['need_ad'] = wiz.need_ad == 'yes'
+
         if wiz.file_type == 'xml':
             return order_obj.export_xml_po_integration(cr, uid, wiz.order_id.id, context=context)
         else:

=== modified file 'bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako'
--- bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako	2014-12-17 12:51:27 +0000
+++ bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako	2016-10-28 14:28:19 +0000
@@ -152,6 +152,7 @@
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Price Unit')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Curr.')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Line')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Ext. Ref')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('CHG')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String"></Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product')}</Data></Cell>
@@ -174,6 +175,7 @@
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(l.move_price_unit or 0.00)|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.move_currency_id.name or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.line_number or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.external_ref or '')|x}</Data></Cell>
         % if l.type_change == 'error':
         <Cell ss:StyleID="line_change" ><Data ss:Type="String">${(getSel(l, 'type_change') or '')|x}</Data></Cell>
         <Cell ss:StyleID="line_change" ><Data ss:Type="String">${(getSel(l, 'integrity_status') or '')|x}</Data></Cell>
@@ -234,7 +236,9 @@
     <Row></Row>
 
     <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Information')}</Data></Cell>
+        <Cell ss:StyleID="header" MergeAcross="3"><Data ss:Type="String">${_('Information')}</Data></Cell>
+    </Row>
+    <Row>
         <Cell ss:StyleID="line" MergeAcross="3" ><Data ss:Type="String">${(o.message or '')|x}</Data></Cell>
     </Row>
 

=== modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako'
--- bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2014-12-17 12:51:27 +0000
+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2016-10-28 14:28:19 +0000
@@ -268,43 +268,49 @@
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(l.in_price or 0.00)|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.in_currency and obj_name_get('res.currency', l.in_currency.id) or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(l.in_line_number)|x}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(l, 'type_change') or '')|x}</Data></Cell>
-        % if l.in_product_id != l.imp_product_id:
+        % if l.type_change == 'del':
+            <Cell ss:StyleID="line_change" ><Data ss:Type="String">${(getSel(l, 'type_change') or '')|x}</Data></Cell>
+        % else:
+            <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(l, 'type_change') or '')|x}</Data></Cell>
+        % endif
+        % if not l.type_change == 'ignore' and (l.type_change == 'del' or l.in_product_id != l.imp_product_id):
         <Cell ss:StyleID="line_change" ><Data ss:Type="String">${(l.imp_product_id and obj_name_get('product.product', l.imp_product_id.id) or '')|x}</Data></Cell>
         % else:
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.imp_product_id and obj_name_get('product.product', l.imp_product_id.id) or '')|x}</Data></Cell>
         % endif
-        % if l.in_qty != l.imp_qty:
+        % if not l.type_change == 'ignore' and (l.type_change == 'del' or l.in_qty != l.imp_qty):
         <Cell ss:StyleID="line_change" ><Data ss:Type="Number">${(l.imp_qty or 0.00)|x}</Data></Cell>
         % else:
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(l.imp_qty or 0.00)|x}</Data></Cell>
         % endif
-        % if l.in_price != l.imp_price:
+        % if not l.type_change == 'ignore' and (l.type_change == 'del' or l.in_price != l.imp_price):
         <Cell ss:StyleID="line_change" ><Data ss:Type="Number">${(l.imp_price or 0.00)|x}</Data></Cell>
         % else:
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(l.imp_price or 0.00)|x}</Data></Cell>
         % endif
-        % if l.imp_discrepancy != 0.00:
+        % if not l.type_change == 'ignore' and (l.type_change == 'del' or l.imp_discrepancy != 0.00):
         <Cell ss:StyleID="line_change" ><Data ss:Type="Number">${(l.imp_discrepancy or 0.00)|x}</Data></Cell>
         % else:
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(l.imp_discrepancy or 0.00)|x}</Data></Cell>
         % endif
-        % if l.in_currency != l.imp_currency:
+        % if not l.type_change == 'ignore' and (l.type_change == 'del' or l.in_currency != l.imp_currency):
         <Cell ss:StyleID="line_change" ><Data ss:Type="String">${(l.imp_currency and obj_name_get('res.currency', l.imp_currency.id) or '')|x}</Data></Cell>
         % else:
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.imp_currency and obj_name_get('res.currency', l.imp_currency.id) or '')|x}</Data></Cell>
         % endif
-        % if l.in_drd != l.imp_drd and l.imp_drd not in ('False', False):
+        % if not l.type_change == 'ignore' and (l.type_change == 'del' or (l.in_drd != l.imp_drd and l.imp_drd not in ('False', False))):
         <Cell ss:StyleID="line_change_short_date" ><Data ss:Type="DateTime">${(l.imp_drd)|n}T00:00:00.000</Data></Cell>
         % elif l.imp_drd not in ('False', False):
         <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${(l.imp_drd)|n}T00:00:00.000</Data></Cell>
         % else:
         <Cell ss:StyleID="line" ></Cell>
         % endif
-        % if l.in_dcd != l.imp_dcd and l.imp_dcd not in ('False', False):
+        % if not l.type_change == 'ignore' and ((l.type_change == 'del' or l.in_dcd != l.imp_dcd) and l.imp_dcd not in ('False', False)):
         <Cell ss:StyleID="line_change_short_date" ><Data ss:Type="DateTime">${(l.imp_dcd)|n}T00:00:00.000</Data></Cell>
         % elif l.imp_dcd not in ('False', False):
         <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${(l.imp_dcd)|n}T00:00:00.000</Data></Cell>
+        % elif l.type_change == 'del':
+        <Cell ss:StyleID="line_change"></Cell>
         % else:
         <Cell ss:StyleID="line" ></Cell>
         % endif

=== modified file 'bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml'
--- bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-05-26 08:58:45 +0000
+++ bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-10-28 14:28:19 +0000
@@ -139,6 +139,8 @@
                 <form string="Export PO validated">
                     <separator colspan="4" string="File format" />
                     <field name="file_type" />
+                    <newline />
+                    <field name="need_ad" colspan="2" invisible="1" />
                     <separator colspan="4" string="Actions" />
                     <group colspan="4" col="4">
                         <label> </label>

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2016-08-23 12:54:03 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2016-10-28 14:28:19 +0000
@@ -40,7 +40,7 @@
 # Server imports
 # Addons imports
 NB_OF_HEADER_LINES = 7
-NB_LINES_COLUMNS = 12
+NB_LINES_COLUMNS = 13
 
 
 PRODUCT_CODE_ID = {}
@@ -49,20 +49,22 @@
 PRODLOT_NAME_ID = {}
 
 SIMU_LINES = {}
+LN_BY_EXT_REF = {}
 
 
 LINES_COLUMNS = [(0, _('Line number'), 'optionnal'),
-                 (1, _('Product Code'), 'mandatory'),
-                 (2, _('Product Description'), 'optionnal'),
-                 (3, _('Product Qty'), 'mandatory'),
-                 (4, _('Product UoM'), 'mandatory'),
-                 (5, _('Price Unit'), 'mandatory'),
-                 (6, _('Currency'), 'mandatory'),
-                 (7, _('Batch'), 'optionnal'),
-                 (8, _('Expiry Date'), 'optionnal'),
-                 (9, _('Packing List'), 'optionnal'),
-                 (10, _('ESC message 1'), 'optionnal'),
-                 (11, _('ESC message 2'), 'optionnal'),
+                 (1, _('External Ref.'), 'optionnal'),
+                 (2, _('Product Code'), 'mandatory'),
+                 (3, _('Product Description'), 'optionnal'),
+                 (4, _('Product Qty'), 'mandatory'),
+                 (5, _('Product UoM'), 'mandatory'),
+                 (6, _('Price Unit'), 'mandatory'),
+                 (7, _('Currency'), 'mandatory'),
+                 (8, _('Batch'), 'optionnal'),
+                 (9, _('Expiry Date'), 'optionnal'),
+                 (10, _('Packing List'), 'optionnal'),
+                 (11, _('ESC message 1'), 'optionnal'),
+                 (12, _('ESC message 2'), 'optionnal'),
                  ]
 
 HEADER_COLUMNS = [(1, _('Freight'), 'optionnal'),
@@ -326,7 +328,7 @@
                 index = get_field_index(field, index)
             else:
                 index += 1
-                values[index] = ['line_number', 'product_code',
+                values[index] = ['line_number', 'external_ref', 'product_code',
                                  'product_name', 'product_qty',
                                  'uom_id', 'price_unit', 'currency_id',
                                  'prodlot_id', 'expiry_date',
@@ -390,6 +392,7 @@
             global CURRENCY_NAME_ID
             global PRODLOT_NAME_ID
             global SIMU_LINES
+            global LN_BY_EXT_REF
 
             if context is None:
                 context = {}
@@ -419,6 +422,7 @@
                     First of all, we build a cache for simulation screen lines
                     '''
                     l_num = line.line_number
+                    l_ext_ref = line.external_ref
                     l_prod = line.move_product_id and line.move_product_id.id or False
                     l_uom = line.move_uom_id and line.move_uom_id.id or False
                     # By simulation screen
@@ -441,6 +445,11 @@
                     SIMU_LINES[wiz.id][l_num][l_prod][l_uom].setdefault(line.move_product_qty, [])
                     SIMU_LINES[wiz.id][l_num][l_prod][l_uom][line.move_product_qty].append(line.id)
 
+                    LN_BY_EXT_REF.setdefault(wiz.id, {})
+                    if l_ext_ref and l_num:
+                        LN_BY_EXT_REF[wiz.id].setdefault(l_ext_ref, [])
+                        LN_BY_EXT_REF[wiz.id][l_ext_ref].append(l_num)
+
                 # Variables
                 lines_to_ignored = []  # Bad formatting lines
                 file_format_errors = []
@@ -543,6 +552,9 @@
                     # Check mandatory fields
                     not_ok = False
                     file_line_error = []
+                    line_number = values.get(x, [False])[0] and int(values.get(x, [False])[0]) or False
+                    ext_ref = values.get(x, [False, False])[1]
+                    ext_ref = ext_ref and str(ext_ref) or False
                     for manda_field in LINES_COLUMNS:
                         if manda_field[2] == 'mandatory' and not values.get(x, [])[manda_field[0]]:
                             not_ok = True
@@ -551,10 +563,16 @@
                             values_line_errors.append(err)
                             file_line_error.append(err1)
 
-                    if not values.get(x, [''])[0]:
-                        line_number = False
-                    else:
-                        line_number = int(values.get(x, [''])[0])
+                    if line_number and ext_ref:
+                        if line_number not in LN_BY_EXT_REF[wiz.id].get(ext_ref, []):
+                            not_ok = True
+                            err1 = _('No line found for line number \'%s\' and ext. ref. \'%s\' - Line not imported') % (line_number, ext_ref)
+                            err = _('Line %s of the file: %s') % (x, err1)
+                            values_line_errors.append(err)
+                            file_line_error.append(err1)
+
+                    if not line_number and ext_ref:
+                        line_number = LN_BY_EXT_REF[wiz.id].get(ext_ref, [False])[0]
 
                     if not_ok:
                         not_ok_file_lines[x] = ' - '.join(err for err in file_line_error)
@@ -566,47 +584,47 @@
 
                     vals = values.get(x, [])
                     # Product
-                    if vals[1]:
-                        product_id = PRODUCT_CODE_ID.get(vals[1], False)
-                    if not product_id and vals[1]:
-                        prod_ids = prod_obj.search(cr, uid, [('default_code', '=', vals[1])], context=context)
+                    if vals[2]:
+                        product_id = PRODUCT_CODE_ID.get(vals[2], False)
+                    if not product_id and vals[2]:
+                        prod_ids = prod_obj.search(cr, uid, [('default_code', '=', vals[2])], context=context)
                         if prod_ids:
                             product_id = prod_ids[0]
-                            PRODUCT_CODE_ID.setdefault(vals[1], product_id)
+                            PRODUCT_CODE_ID.setdefault(vals[2], product_id)
 
                     # UoM
-                    if vals[4]:
-                        uom_id = UOM_NAME_ID.get(vals[4], False)
+                    if vals[5]:
+                        uom_id = UOM_NAME_ID.get(vals[5], False)
                         if not uom_id:
-                            uom_ids = uom_obj.search(cr, uid, [('name', '=', vals[4])], context=context)
+                            uom_ids = uom_obj.search(cr, uid, [('name', '=', vals[5])], context=context)
                             if uom_ids:
                                 uom_id = uom_ids[0]
-                                UOM_NAME_ID.setdefault(vals[4], uom_id)
+                                UOM_NAME_ID.setdefault(vals[5], uom_id)
 
                     # Qty
-                    if vals[3]:
-                        qty = float(vals[3])
+                    if vals[4]:
+                        qty = float(vals[4])
 
                     # Batch and expiry date
                     # Put the batch + expiry date in a cache to create
                     # the batch that don't exist only during the import
                     # not at simulation time
-                    if vals[7] and vals[8]:
-                        exp_value = vals[8]
-                        if type(vals[8]) == type(DateTime.now()):
+                    if vals[8] and vals[9]:
+                        exp_value = vals[9]
+                        if type(vals[9]) == type(DateTime.now()):
                             exp_value = exp_value.strftime('%Y-%m-%d')
-                        elif vals[8] and isinstance(vals[8], str):
+                        elif vals[9] and isinstance(vals[9], str):
                             try:
-                                time.strptime(vals[8], '%Y-%m-%d')
-                                exp_value = vals[8]
+                                time.strptime(vals[9], '%Y-%m-%d')
+                                exp_value = vals[9]
                             except ValueError:
                                 exp_value = False
 
-                        if exp_value and not prodlot_cache.get(product_id, {}).get(str(vals[7])):
+                        if exp_value and not prodlot_cache.get(product_id, {}).get(str(vals[8])):
                             prodlot_cache.setdefault(product_id, {})
-                            prodlot_cache[product_id].setdefault(str(vals[7]), exp_value)
+                            prodlot_cache[product_id].setdefault(str(vals[8]), exp_value)
 
-                    file_lines[x] = (line_number, product_id, uom_id, qty)
+                    file_lines[x] = (line_number, product_id, uom_id, qty, ext_ref)
 
                 '''
                 Get the best matching line:
@@ -956,6 +974,7 @@
         'str_line_number': fields.function(_get_l_num, method=True, type='char', size=32,
                                            string='Line', readonly=True, multi='line_num',
                                            store={'wizard.import.in.line.simulation.screen': (lambda self, cr, uid, ids, c={}: ids, ['line_number'], 20)}),
+        'external_ref': fields.char(size=256, string='External Ref.', readonly=True),
         'type_change': fields.selection([('', ''),
                                          ('split', 'Split'),
                                          ('error', 'Error'),
@@ -978,6 +997,7 @@
         'imp_batch_name': fields.char(size=128, string='Batch Number', readonly=True),
         'imp_exp_date': fields.date(string='Expiry date', readonly=True),
         'imp_packing_list': fields.char(size=256, string='Packing list', readonly=True),
+        'imp_external_ref': fields.char(size=256, string='External ref.', readonly=True),
         'message_esc1': fields.char(size=256, string='Message ESC 1', readonly=True),
         'message_esc2': fields.char(size=256, string='Message ESC 2', readonly=True),
         # Computed fields
@@ -1060,9 +1080,16 @@
         errors = []
         warnings = []
 
+        if len(values) == 13:
+            ext_ref = values.pop(1)
+            values.append(ext_ref)
+
         for line in self.browse(cr, uid, ids, context=context):
             write_vals = {}
 
+            if ext_ref:
+                write_vals['imp_external_ref'] = ext_ref
+
             # Product
             prod_id = False
             if (values[1] and values[1] == line.move_product_id.default_code):
@@ -1256,7 +1283,10 @@
 
             if line.type_change == 'new':
                 write_vals['type_change'] = 'error'
-                errors.append(_('Line does not correspond to original IN'))
+                if write_vals.get('imp_external_ref'):
+                    errors.append(_('No original IN lines with external ref \'%s\' found.') % write_vals['imp_external_ref'])
+                else:
+                    errors.append(_('Line does not correspond to original IN'))
 
             error_msg = line.error_msg or ''
             for err in errors:

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml	2016-10-28 14:28:19 +0000
@@ -81,6 +81,7 @@
                     <field name="move_price_unit" />
                     <field name="move_currency_id" />
                     <field name="str_line_number" />
+                    <field name="external_ref" />
                     <field name="error_msg" invisible="1" />
                     <button name="get_error_msg" type="object" icon="gtk-dialog-warning" string="See error" attrs="{'invisible': [('error_msg', '=', False), ('integrity_status', 'in', ('empty', False, ''))]}" />
                     <field name="type_change" />
@@ -99,6 +100,7 @@
                     <field name="kc_check" widget="null_boolean" />
                     <field name="dg_check" widget="null_boolean" />
                     <field name="np_check" widget="null_boolean" />
+                    <field name="imp_external_ref" />
                     <field name="imp_packing_list" />
                     <field name="message_esc1" />
                     <field name="message_esc2" />

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2016-08-23 12:54:03 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2016-10-28 14:28:19 +0000
@@ -48,6 +48,8 @@
 CURRENCY_NAME_ID = {}
 
 SIMU_LINES = {}
+LN_BY_EXT_REF = {}
+EXT_REF_BY_LN = {}
 
 """
 UF-2538 optional 4nd tuple item: list of states for mandatory check
@@ -62,6 +64,7 @@
                  (6, _('Price Unit'), 'mandatory'),
                  (7, _('Currency'), 'mandatory'),
                  (8, _('Origin'), 'optionnal'),
+                 (14, _('Comment'), 'optionnal'),
                  (10, _('Delivery Confirmed Date'), 'mandatory', ('!=', ['confirmed'])),
                  (16, _('Project Ref.'), 'optionnal'),
                  (17, _('Message ESC 1'), 'optionnal'),
@@ -159,6 +162,14 @@
                                    ('done', 'Done')],
                                    string='State',
                                    readonly=True),
+        'with_ad': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+            ],
+            string='File contains Analytic Distribution',
+            required=True,
+        ),
         # File information
         'file_to_import': fields.binary(string='File to import'),
         'filename': fields.char(size=64, string='Filename'),
@@ -259,6 +270,7 @@
 
     _defaults = {
         'state': 'draft',
+        'with_ad': lambda *a: 'yes',
     }
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -336,17 +348,23 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        for wiz in self.browse(cr, uid, ids, context=context):
-            if wiz.filetype == 'excel':
-                xml_file = base64.decodestring(wiz.file_to_import)
-                excel_file = SpreadsheetXML(xmlstring=xml_file)
-                if not excel_file.getWorksheets():
-                    raise osv.except_osv(_('Error'), _('The given file is not a valid Excel 2003 Spreadsheet file !'))
-            else:
-                xml_file = base64.decodestring(wiz.file_to_import)
-                root = ET.fromstring(xml_file)
-                if root.tag != 'data':
-                    raise osv.except_osv(_('Error'), _('The given file is not a valid XML file !'))
+        try:
+            for wiz in self.browse(cr, uid, ids, context=context):
+                if wiz.filetype == 'excel':
+                    xml_file = base64.decodestring(wiz.file_to_import)
+                    excel_file = SpreadsheetXML(xmlstring=xml_file)
+                    if not excel_file.getWorksheets():
+                        raise osv.except_osv(_('Error'), _('The given file is not a valid Excel 2003 Spreadsheet file !'))
+                else:
+                    xml_file = base64.decodestring(wiz.file_to_import)
+                    root = ET.fromstring(xml_file)
+                    if root.tag != 'data':
+                        raise osv.except_osv(_('Error'), _('The given file is not a valid XML file !'))
+        except Exception as e:
+            raise osv.except_osv(
+                _('Error'),
+                _('Error during file to import parsing :: Error: %s') % e,
+            )
 
         self.write(cr, uid, ids, {'state': 'simu_progress'}, context=context)
         cr.commit()
@@ -372,6 +390,14 @@
         rec_lines = []
         rec = False
 
+        ad_field_names = [
+            'analytic_distribution_id',
+            'ad_destination_name',
+            'ad_cost_center_name',
+            'ad_percentage',
+            'ad_subtotal',
+        ]
+
         index = 0
         for record in root:
             if record.tag == 'record':
@@ -393,18 +419,19 @@
                 return index
 
         for field in rec:
-            if field.attrib['name'] != 'order_line':
+            ad_field = field.attrib['name'] in ad_field_names
+            if field.attrib['name'] != 'order_line' and not ad_field:
                 index = get_field_index(field, index)
-            else:
+            elif not ad_field:
                 index += 1
                 values[index] = ['line_number', 'external_ref',
                                  'product_code', 'product_name',
                                  'product_qty', 'product_uom',
                                  'price_unit', 'currency_id',
-                                 'origin', 'date_planned',
+                                 'origin', 'comment', 'date_planned',
                                  'confirmed_delivery_date',
                                  'nomen_manda_0', 'nomen_manda_1',
-                                 'nomen_manda_2', 'comment',
+                                 'nomen_manda_2',
                                  'notes', 'project_ref',
                                  'message_esc1', 'message_esc2']
                 for line in field:
@@ -414,6 +441,8 @@
             index += 1
             values[index] = []
             for fl in line:
+                if fl.attrib['name'] in ad_field_names:
+                    continue
                 if not fl.getchildren():
                     values[index].append(fl.text or '')
                 else:
@@ -469,6 +498,8 @@
             global UOM_NAME_ID
             global CURRENCY_NAME_ID
             global SIMU_LINES
+            global LN_BY_EXT_REF
+            global EXT_REF_BY_LN
 
             if context is None:
                 context = {}
@@ -484,6 +515,13 @@
                                                    'state': 'draft'}, context=context)
                     continue
 
+                nb_file_header_lines = NB_OF_HEADER_LINES
+                nb_file_lines_columns = NB_LINES_COLUMNS
+                first_line_index = nb_file_header_lines + 1
+                if wiz.with_ad == 'yes' and wiz.filetype != 'xml':
+                    nb_file_header_lines += 2
+                    first_line_index += 2
+
                 for line in wiz.simu_line_ids:
                     # Put data in cache
                     if line.in_product_id:
@@ -497,6 +535,7 @@
                     First of all, we build a cache for simulation screen lines
                     '''
                     l_num = line.in_line_number
+                    l_ext_ref = line.in_ext_ref
                     l_prod = line.in_product_id and line.in_product_id.id or False
                     l_uom = line.in_uom and line.in_uom.id or False
                     # By simulation screen
@@ -519,6 +558,14 @@
                     SIMU_LINES[wiz.id][l_num][l_prod][l_uom].setdefault(line.in_qty, [])
                     SIMU_LINES[wiz.id][l_num][l_prod][l_uom][line.in_qty].append(line.id)
 
+                    LN_BY_EXT_REF.setdefault(wiz.id, {})
+                    EXT_REF_BY_LN.setdefault(wiz.id, {})
+                    if line.in_ext_ref:
+                        LN_BY_EXT_REF[wiz.id].setdefault(str(line.in_ext_ref), [])
+                        EXT_REF_BY_LN[wiz.id].setdefault(l_num, [])
+                        LN_BY_EXT_REF[wiz.id][line.in_ext_ref].append(l_num)
+                        EXT_REF_BY_LN[wiz.id][l_num].append(str(line.in_ext_ref))
+
                 # Variables
                 lines_to_ignored = []   # Bad formatting lines
                 file_format_errors = []
@@ -541,28 +588,31 @@
                 '''
                 # Check number of columns on lines
 
-                for x in xrange(1, NB_OF_HEADER_LINES+1):
-                    if len(values.get(x, [])) != 2:
+                for x in xrange(1, nb_file_header_lines+1):
+                    nb_to_check = 2
+                    if x > NB_OF_HEADER_LINES and x <= nb_file_header_lines:
+                        continue
+                    if len(values.get(x, [])) != nb_to_check:
                         lines_to_ignored.append(x)
                         error_msg = _('Line %s of the imported file: The header \
-    information must be on two columns : Column A for name of the field and column\
-     B for value.') % x
+information must be on two columns : Column A for name of the field and column\
+ B for value.') % x
                         file_format_errors.append(error_msg)
 
-                if len(values.get(NB_OF_HEADER_LINES+1, [])) != NB_LINES_COLUMNS:
-                    error_msg = _('Line 20 of the Excel file: This line is \
-    mandatory and must have %s columns. The values on this line must be the name \
-    of the field for PO lines.') % NB_LINES_COLUMNS
+                if len(values.get(first_line_index, [])) < nb_file_lines_columns:
+                    error_msg = _('Line %s of the Excel file: This line is \
+mandatory and must have at least %s columns. The values on this line must be the name \
+of the field for PO lines.') % (first_line_index, nb_file_lines_columns)
                     file_format_errors.append(error_msg)
 
-                for x in xrange(NB_OF_HEADER_LINES+2, len(values)+1):
-                    if len(values.get(x, [])) != NB_LINES_COLUMNS:
+                for x in xrange(first_line_index, len(values)+1):
+                    if len(values.get(x, [])) < nb_file_lines_columns:
                         lines_to_ignored.append(x)
                         error_msg = _('Line %s of the imported file: The line \
-    information must be on %s columns. The line %s has %s columns') % (x, NB_LINES_COLUMNS, x, len(values.get(x, [])))
+information must be on at least %s columns. The line %s has %s columns') % (x, nb_file_lines_columns, x, len(values.get(x, [])))
                         file_format_errors.append(error_msg)
 
-                nb_file_lines = len(values) - NB_OF_HEADER_LINES - 1
+                nb_file_lines = len(values) - first_line_index
                 self.write(cr, uid, [wiz.id], {'nb_file_lines': nb_file_lines}, context=context)
 
                 if len(file_format_errors):
@@ -709,7 +759,7 @@
                 new_po_lines = []
                 not_ok_file_lines = {}
                 # Loop on lines
-                for x in xrange(NB_OF_HEADER_LINES+2, len(values)+1):
+                for x in xrange(first_line_index+1, len(values)+1):
 
                     # Check mandatory fields
                     not_ok = False
@@ -738,7 +788,7 @@
                                 file_line_error.append(err1)
 
                     line_number = values.get(x, [''])[0] and int(values.get(x, [''])[0]) or False
-                    ext_ref = values.get(x, ['', ''])[1]
+                    ext_ref = values.get(x, ['', ''])[1] and str(values.get(x, ['', ''])[1])
 
                     if not line_number and not ext_ref:
                         not_ok = True
@@ -747,6 +797,19 @@
                         values_line_errors.append(err)
                         file_line_error.append(err1)
 
+                    if line_number and ext_ref and (ext_ref not in LN_BY_EXT_REF[wiz.id].keys() or line_number not in LN_BY_EXT_REF[wiz.id][ext_ref]):
+                        not_ok = True
+                        err1 = _('The line cannot have both Line no. and Ext. Ref')
+                        err = _('Line %s of the file: %s') % (x, err1)
+                        values_line_errors.append(err)
+                        file_line_error.append(err1)
+
+                    if not line_number and ext_ref and ext_ref in LN_BY_EXT_REF[wiz.id].keys():
+                        line_number = LN_BY_EXT_REF[wiz.id][ext_ref][0]
+
+                    if not ext_ref and line_number and line_number in EXT_REF_BY_LN[wiz.id].keys():
+                        ext_ref = EXT_REF_BY_LN[wiz.id][line_number][0]
+
                     if not_ok:
                         not_ok_file_lines[x] = ' - '.join(err for err in file_line_error)
 
@@ -779,7 +842,7 @@
                     if vals[4]:
                         qty = float(vals[4])
 
-                    file_lines[x] = (line_number or ext_ref, product_id, uom_id, qty)
+                    file_lines[x] = (line_number, product_id, uom_id, qty, ext_ref)
 
                 '''
                 Get the best matching line :
@@ -920,6 +983,7 @@
                     vals = values.get(po_line, [])
                     new_wl_id = wl_obj.create(cr, uid, {'type_change': 'new',
                                                         'in_line_number': values.get(po_line, [])[0] and int(values.get(po_line, [])[0]) or False,
+                                                        'in_ext_ref': values.get(po_line, [])[1] or False,
                                                         'simu_id': wiz.id}, context=context)
                     err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, context=context)
                     if po_line in not_ok_file_lines:
@@ -934,7 +998,8 @@
 
                 # Lines to delete
                 for po_line in SIMU_LINES[wiz.id]['line_ids']:
-                    wl_obj.write(cr, uid, po_line, {'type_change': 'del'}, context=context)
+                    if wl_obj.read(cr, uid, [po_line], ['type_change'], context=context)[0]['type_change'] != 'del':
+                        wl_obj.write(cr, uid, po_line, {'type_change': 'ignore'}, context=context)
 
                 '''
                 We generate the message which will be displayed on the simulation
@@ -1071,7 +1136,7 @@
 
 class wizard_import_po_simulation_screen_line(osv.osv):
     _name = 'wizard.import.po.simulation.screen.line'
-    _order = 'is_new_line, in_line_number, in_product_id, id'
+    _order = 'is_new_line, in_line_number, in_ext_ref, in_product_id, id'
     _rec_name = 'in_line_number'
 
     def _get_line_info(self, cr, uid, ids, field_name, args, context=None):
@@ -1081,6 +1146,14 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        delete_line_ids = self.search(cr, uid, [
+            ('imp_comment', '=', '[DELETE]')
+        ], context=context)
+        delete_line_numbers = set()
+        for x in self.read(cr, uid, delete_line_ids, ['in_line_number'], context=context):
+            if x['in_line_number']:
+                delete_line_numbers.add(x['in_line_number'])
+
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = {'in_product_id': False,
@@ -1092,6 +1165,7 @@
                             'in_dcd': False,
                             'in_price': 0.00,
                             'in_currency': False,
+                            'in_ext_ref': False,
                             'imp_discrepancy': 0.00,
                             'change_ok': False}
 
@@ -1106,7 +1180,8 @@
                 res[line.id]['in_dcd'] = l.confirmed_delivery_date
                 res[line.id]['in_price'] = l.price_unit
                 res[line.id]['in_currency'] = l.currency_id and l.currency_id.id or False
-                if line.type_change != 'del':
+                res[line.id]['in_ext_ref'] = l.external_ref or False
+                if line.type_change != '':
                     if line.imp_qty and line.imp_price:
                         disc = (line.imp_qty*line.imp_price)-(line.in_qty*line.in_price)
                         res[line.id]['imp_discrepancy'] = disc
@@ -1120,8 +1195,11 @@
                     price_change = not(res[line.id]['in_price'] == line.imp_price)
                     drd_change = not(res[line.id]['in_drd'] == line.imp_drd)
                     dcd_change = not(res[line.id]['in_dcd'] == line.imp_dcd)
+                    to_delete = line.imp_comment == '[DELETE]'
+                    if to_delete:
+                        delete_line_numbers.add(line.in_line_number)
 
-                    if line.simu_id.state != 'draft' and (prod_change or qty_change or price_change or drd_change or dcd_change):
+                    if line.simu_id.state != 'draft' and (prod_change or qty_change or price_change or drd_change or dcd_change or to_delete):
                         res[line.id]['change_ok'] = True
                 elif line.type_change == 'del':
                     res[line.id]['imp_discrepancy'] = -(line.in_qty*line.in_price)
@@ -1190,8 +1268,10 @@
         'is_new_line': fields.function(_get_str_line_number, method=True, string='Is new line ?',
                                        type='boolean', readonly=True, multi='new_line',
                                        store={'wizard.import.po.simulation.screen.line': (lambda self, cr, uid, ids, c={}: ids, ['in_line_number'], 20),}),
+        'in_ext_ref': fields.char(size=256, string='External Ref.', readonly=True),
         'type_change': fields.selection([('', ''), ('error', 'Error'), ('new', 'New'),
-                                         ('split', 'Split'), ('del', 'Del'),],
+                                         ('split', 'Split'), ('del', 'Del'),
+                                         ('ignore', 'Ignore')],
                                          string='CHG', readonly=True),
         'imp_product_id': fields.many2one('product.product', string='Product',
                                           readonly=True),
@@ -1206,6 +1286,7 @@
         'imp_dcd': fields.date(string='Delivery Confirmed Date', readonly=True),
         'imp_esc1': fields.char(size=256, string='Message ESC1', readonly=True),
         'imp_esc2': fields.char(size=256, string='Message ESC2', readonly=True),
+        'imp_comment': fields.text(string='Comment', readonly=True),
         'imp_external_ref': fields.char(size=256, string='External Ref.', readonly=True),
         'imp_project_ref': fields.char(size=256, string='Project Ref.', readonly=True),
         'imp_origin': fields.char(size=256, string='Origin Ref.', readonly=True),
@@ -1246,20 +1327,35 @@
         for line in self.browse(cr, uid, ids, context=context):
             write_vals = {}
 
+            # Comment
+            write_vals['imp_comment'] = values[14] and values[14].strip()
+
             # External Ref.
             write_vals['imp_external_ref'] = values[1]
-            if line.in_line_number and write_vals['imp_external_ref']:
-                errors.append(_('The line cannot have both Line no. and Ext Ref.'))
-                write_vals['in_line_number'] = False
-                write_vals['imp_external_ref'] = False
-                write_vals['type_change'] = 'error'
-            elif line.in_line_number:
+            pol_ids = None
+            if line.in_line_number:
                 pol_ids = self.pool.get('purchase.order.line').search(cr, uid, [('order_id', '=', line.simu_id.order_id.id), ('line_number', '=', line.in_line_number)], context=context)
-                if not pol_ids:
+                if not pol_ids and not (write_vals['imp_comment'] and write_vals['imp_comment'] == '[DELETE]'):
                     errors.append(_('Line no is not consistent with validated PO.'))
                     write_vals['in_line_number'] = False
                     write_vals['type_change'] = 'error'
 
+            if (write_vals['imp_comment'] and write_vals['imp_comment'] == '[DELETE]'):
+                if not pol_ids:
+                    write_vals['type_change'] = 'error'
+                    if line.in_line_number:
+                        errors.append(_('The import file is inconsistent. Line no. %s is not existing or was previously deleted') % line.in_line_number)
+                    else:
+                        errors.append(_('The import file is inconsistent. The matching line is not existing or was previously deleted'))
+                else:
+                    write_vals['type_change'] = 'del'
+                    if line.in_line_number:
+                        to_delete = self.search(cr, uid, [
+                            ('simu_id', '=', line.simu_id.id),
+                            ('in_line_number', '=', line.in_line_number),
+                        ], context=context)
+                        self.write(cr, uid, to_delete, {'type_change': 'del'}, context=context)
+
             if not line.in_line_number and not write_vals.get('imp_external_ref'):
                 errors.append(_('The line should have a Line no. or an Ext Ref.'))
                 write_vals['in_line_number'] = False
@@ -1437,15 +1533,17 @@
         line_treated = 0.00
         percent_completed = 0.00
         for line in self.browse(cr, uid, ids, context=context):
+            context['purchase_id'] = line.simu_id.order_id.id
             line_treated += 1
             percent_completed = int(float(line_treated) / float(nb_lines) * 100)
-            if line.po_line_id and line.type_change != 'del' and not line.change_ok and not line.imp_external_ref and not line.imp_project_ref and not line.imp_origin:
+            if line.po_line_id and line.type_change != 'ignore' and not line.change_ok and not line.imp_external_ref and not line.imp_project_ref and not line.imp_origin:
                 continue
 
-            if line.type_change in ('del', 'error'):
+            if line.type_change in ('ignore', 'error'):
                 # Don't do anything
-                # i.e. Skype conversation with Raffaelle (08.01.2014) : deletes will need to be done manually after import
                 continue
+            elif line.type_change == 'del' and line.po_line_id:
+                line_obj.fake_unlink(cr, uid, [line.po_line_id.id], context=context)
             elif line.type_change == 'split' and line.parent_line_id:
                 # Call the split line wizard
                 po_line_id = False
@@ -1524,7 +1622,6 @@
                              'product_uom': line.imp_uom.id,
                              'price_unit': line.imp_price,
                              'product_qty': line.imp_qty,
-                             'line_number': line.in_line_number,
                              'date_planned': line.imp_drd or line.simu_id.order_id.delivery_requested_date,
                             }
                 if line.imp_dcd:

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2014-10-13 11:03:40 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2016-10-28 14:28:19 +0000
@@ -20,6 +20,7 @@
                                attrs="{'invisible': [('import_error_ok', '!=', False), ('state', '!=', 'done')]}" />
                         <field name="error_filename" invisible="1" />
                         <field name="import_error_ok" invisible="1" />
+                        <field name="with_ad" attrs="{'readonly': [('state', '!=', 'draft')]}" invisible="1" />
                         <field name="percent_completed" widget="progressbar" attrs="{'invisible': [('state', '=', 'draft')]}" />
                         <field name="state" invisible="0" />
                     </group>
@@ -83,7 +84,7 @@
                         <page string="Details">
                             <!-- LINES -->
                             <field name="simu_line_ids" nolabel="1" colspan="4">
-                                <tree string="Lines" colors="grey: type_change == 'del'; red: type_change == 'error'; orange: change_ok==True and type_change not in ('del', 'error'); blue: type_change=='split'; green: type_change=='new'">
+                                <tree string="Lines" colors="grey: type_change == 'del'; red: type_change == 'error'; orange: change_ok==True and type_change not in ('del', 'ignore', 'error'); blue: type_change=='split'; green: type_change=='new'">
                                     <field name="in_product_id" />
                                     <field name="in_nomen" />
                                     <field name="in_comment" />
@@ -95,6 +96,7 @@
                                     <field name="in_currency" />
                                     <field name="in_line_number" invisible="1" />
                                     <field name="str_in_line_number" />
+                                    <field name="in_ext_ref" />
                                     <field name="type_change" />
                                     <field name="error_msg" invisible="1" />
                                     <button name="get_error_msg" type="object" icon="gtk-dialog-warning" string="See error" attrs="{'invisible': [('error_msg', '=', False)]}" />

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-07-25 08:20:05 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-10-28 14:28:19 +0000
@@ -374,7 +374,9 @@
                                               'move_uom_id': move.product_uom and move.product_uom.id or False,
                                               'move_price_unit': move.price_unit or move.product_id.standard_price,
                                               'move_currency_id': move.price_currency_id and move.price_currency_id.id or False,
-                                              'line_number': move.line_number, }, context=context)
+                                              'line_number': move.line_number,
+                                              'external_ref': move.purchase_line_id and move.purchase_line_id.external_ref or False,
+                                              }, context=context)
 
         return {'type': 'ir.actions.act_window',
                 'res_model': 'wizard.import.in.simulation.screen',

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-10-25 09:13:52 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-10-28 14:28:19 +0000
@@ -18086,19 +18086,47 @@
 msgid "Available for incoming shipment ?"
 msgstr "Disponible pour envoi entrant ?"
 
-#. modules: purchase, account, reason_types_moves, stock_override, order_nomenclature, sale, product_asset, specific_rules, purchase_override, supplier_catalogue, base, product_list, tender_flow, msf_supply_doc_export, msf_doc_import, return_claim, analytic_distribution
+#. modules: tender_flow, product_asset, update_client, register_accounting, return_claim, msf_doc_import, supplier_catalogue, purchase_compare_rfq, product_list, analytic_distribution, reason_types_moves, stock_override, consumption_calculation, purchase_override, specific_rules, kit, base, msf_tools, purchase, account, msf_outgoing, order_nomenclature, msf_field_access_rights, sale, msf_button_access_rights, msf_supply_doc_export
 #: field:account.move.line.reconcile.writeoff,comment:0
 #: field:account.commitment,notes:0
+#: field:account.invoice.line,inactive_error:0
 #: field:res.groups,comment:0
-#: code:addons/msf_doc_import/wizard/__init__.py:45
-#: code:addons/msf_doc_import/wizard/__init__.py:50
-#: code:addons/msf_doc_import/wizard/__init__.py:55
-#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:183
+#: field:real.average.consumption.line,remark:0
+#: field:composition.item,inactive_error:0
+#: report:kit.report:0
+#: field:msf_button_access_rights.button_access_rule,comment:0
+#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:232
+#: code:addons/msf_doc_import/wizard/__init__.py:41
+#: code:addons/msf_doc_import/wizard/__init__.py:58
+#: code:addons/msf_doc_import/wizard/__init__.py:83
+#: code:addons/msf_doc_import/wizard/__init__.py:108
+#: code:addons/msf_doc_import/wizard/__init__.py:119
+#: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:244
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:67
+#: field:initial.stock.inventory.line,inactive_error:0
+#: report:po.simulation.screen:0
+#: field:purchase.line.import.xml.line,comment:0
+#: field:purchase.order.line,inactive_error:0
+#: field:sale.order.line,inactive_error:0
+#: field:stock.inventory.line,inactive_error:0
+#: field:wizard.import.po.simulation.screen.line,imp_comment:0
+#: field:wizard.import.po.simulation.screen.line,in_comment:0
+#: field:wizard.simu.import.po.line,initial_comment:0
+#: field:msf_field_access_rights.field_access_rule,comment:0
+#: report:invoice:0
+#: field:memory.additionalitems,comment:0
+#: report:packing.list:0
+#: report:picking.ticket:0
+#: field:shipment.additional.line.processor,comment:0
+#: field:shipment.additionalitems,comment:0
+#: field:stock.move.memory.shipment.additionalitems,comment:0
 #: report:addons/msf_supply_doc_export/report/product_list_xls.mako:52
 #: report:addons/msf_supply_doc_export/report/report_internal_request_xls.mako:64
 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:77
 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:76
 #: report:addons/msf_supply_doc_export/report/report_sale_order_xls.mako:77
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:227
+#: field:automated.import.job,comment:0
 #: field:purchase.order.line,comment:0
 #: field:purchase.order.merged.line,comment:0
 #: field:sale.order.line,comment:0
@@ -18110,24 +18138,31 @@
 #: field:old.product.list.line,comment:0
 #: field:product.list.line,comment:0
 #: field:purchase.order.line,name:0
+#: code:addons/purchase_compare_rfq/wizard/compare_rfq.py:459
 #: report:msf.purchase.order:0
 #: report:msf.purchase.quotation:0
 #: report:purchase.order.merged:0
 #: field:purchase.order.merged.line,name:0
 #: field:stock.inventory.line,comment:0
 #: field:stock.move,comment:0
+#: field:account.direct.invoice.wizard.line,inactive_error:0
+#: field:wizard.account.invoice.line,inactive_error:0
 #: field:claim.event,description_claim_event:0
+#: report:msf.freight_manifest:0
 #: report:msf.product_list:0
 #: report:msf.report_reception_in:0
 #: report:msf.sale.order:0
 #: field:sale.order.line,name:0
 #: field:initial.stock.inventory.line,comment:0
 #: field:report.stock.move,comment:0
+#: report:addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako:77
 #: view:supplier.catalogue:0
 #: field:supplier.catalogue,comment:0
 #: field:supplier.catalogue.line,comment:0
+#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:552
 #: field:pricelist.partnerinfo,comment:0
 #: field:tender.line,comment:0
+#: field:sync_client.version,comment:0
 #, python-format
 msgid "Comment"
 msgstr "Commentaire"
@@ -27825,17 +27860,28 @@
 msgid "Macau"
 msgstr "Macau"
 
-#. modules: purchase, account, sale, register_accounting, purchase_override, purchase_allocation_report
+#. modules: purchase, account, account_mcdb, procurement_request, purchase_override, sale, account_override, purchase_allocation_report, register_accounting, msf_supply_doc_export
 #: field:account.invoice.line,price_subtotal:0
+#: report:addons/account_mcdb/report/report_account_analytic_line_free_xls.mako:98
+#: report:addons/account_mcdb/report/report_account_analytic_line_free_xls.mako:185
+#: report:addons/account_override/report/open_invoices_xls.mako:361
+#: report:allocation.invoices.report:0
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:180
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:185
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:202
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:237
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:243
+#: report:procurement.request.report:0
 #: field:purchase.order.line,price_subtotal:0
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 #: report:po.line.allocation.report:0
 #: report:purchase.order.allocation.report:0
-#: report:sale.order.allocation.report:0
 #: field:purchase.order.line.allocation.report,subtotal:0
 #: field:purchase.order.merged.line,price_subtotal:0
+#: field:account.direct.invoice.wizard.line,price_subtotal:0
 #: field:wizard.account.invoice.line,price_subtotal:0
+#: report:sale.order.allocation.report:0
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Sous-total"
@@ -60076,32 +60122,43 @@
 msgid "Error at import"
 msgstr "Error at import"
 
-#. modules: msf_budget, purchase, tender_flow, account_mcdb, msf_homere_interface, account_hq_entries, analytic_distribution, msf_doc_import, financing_contract, purchase_allocation_report, register_accounting
+#. modules: msf_budget, purchase, register_accounting, account_mcdb, msf_homere_interface, financing_contract, sale, account_hq_entries, account_override, purchase_allocation_report, tender_flow, msf_supply_doc_export, msf_doc_import, analytic_override, analytic_distribution
 #: field:hq.analytic.reallocation,cost_center_id:0
 #: field:hq.entries,cost_center_id:0
+#: field:hq.entries.split.lines,cost_center_id:0
 #: view:account.analytic.line:0
 #: view:account.mcdb:0
-#: code:addons/account_mcdb/report/account_mcdb_export.py:167
+#: field:account.mcdb,analytic_account_cc_ids:0
+#: code:addons/account_mcdb/report/account_mcdb_export.py:189
 #: report:addons/account_mcdb/report/report_account_analytic_line_xls.mako:66
+#: report:allocation.invoices.report:0
+#: view:account.analytic.line:0
+#: report:addons/analytic_distribution/report/report_account_analytic_chart_export.mako:131
+#: view:analytic.distribution.wizard:0
+#: field:analytic.distribution.wizard.fp.lines,cost_center_id:0
+#: view:analytic.distribution.wizard.lines:0
+#: field:int.commitment.realloc.wizard,cost_center_id:0
 #: selection:account.analytic.account,category:0
-#: view:account.analytic.line:0
 #: field:account.analytic.line,cost_center_id:0
-#: view:analytic.distribution.wizard:0
-#: field:analytic.distribution.wizard.fp.lines,cost_center_id:0
-#: view:analytic.distribution.wizard.lines:0
+#: report:addons/financing_contract/report/project_expenses_xls.mako:482
 #: field:msf.budget,cost_center_id:0
+#: field:msf.doc.import.accounting.lines,cost_center_id:0
 #: field:hr.analytic.reallocation,cost_center_id:0
 #: field:hr.employee,cost_center_id:0
 #: field:hr.payroll.msf,cost_center_id:0
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:178
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:183
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:200
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:235
+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:241
+#: report:po.follow.up_rml:0
 #: view:purchase.report:0
+#: report:po.line.allocation.report:0
+#: report:purchase.order.allocation.report:0
+#: view:account.direct.invoice.wizard.lines:0
+#: field:wizard.register.import.lines,cost_center_id:0
+#: report:sale.order.allocation.report:0
 #: field:purchase.report,cost_center_id:0
-#: field:account.mcdb,analytic_account_cc_ids:0
-#: report:addons/financing_contract/report/project_expenses_xls.mako:461
-#: field:msf.doc.import.accounting.lines,cost_center_id:0
-#: report:po.line.allocation.report:0
-#: report:sale.order.allocation.report:0
-#: report:purchase.order.allocation.report:0
-#: field:wizard.register.import.lines,cost_center_id:0
 #, python-format
 msgid "Cost Center"
 msgstr "Centre de Coût"
@@ -70659,6 +70716,16 @@
 msgid "Ordered qty"
 msgstr "Qté commandée"
 
+#. module: sales_followup
+#: field:sale.order.line.followup,qty_ordered:0
+msgid "Line number"
+msgstr "N° de ligne"
+
+#. module: sales_followup
+#: field:sale.order.line.followup,qty_ordered:0
+msgid "Ext. Ref"
+msgstr "Ref. ext."
+
 #. module: return_claim
 #: model:ir.module.module,shortdesc:return_claim.module_meta_information
 msgid "MSF Return-Claim"
@@ -74408,6 +74475,7 @@
 #, python-format
 msgid "The column '%s' is not present in the file."
 msgstr "La colonne '%s' n'est pas présente dans le fichier."
+<<<<<<< TREE
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166
@@ -74689,3 +74757,86 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+=======
+
+#. module: msf_doc_import
+#: field:wizard.export.po.validated,need_ad:0
+msgid "Export AD"
+msgstr "Exporter la Distribution Analytique"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:569
+#, python-format
+msgid "No line found for line number '%s' and ext. ref. '%s' - Line not imported"
+msgstr "Pas de ligne trouvée avec le numéro de ligne '%s' et la réf. externe '%s' - Ligne non importée"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:562
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:570
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:786
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:796
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:803
+#, python-format
+msgid "Line %s of the file: %s"
+msgstr "Ligne %s du fichier : %s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:56
+#: field:wizard.import.in.line.simulation.screen,external_ref:0
+#: field:wizard.import.po.simulation.screen.line,imp_external_ref:0
+#: field:wizard.import.po.simulation.screen.line,in_ext_ref:0
+#, python-format
+msgid "External Ref."
+msgstr "Réf. Externe"
+
+#. module: msf_doc_import
+#: field:wizard.import.in.line.simulation.screen,imp_external_ref:0
+msgid "External ref."
+msgstr "Réf. Externe"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1287
+#, python-format
+msgid "No original IN lines with external ref '%s' found."
+msgstr "Pas de ligne trouvée dans la réception originale avec la réf. externe '%s'."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1289
+#, python-format
+msgid "Line does not correspond to original IN"
+msgstr "La ligne ne correspond pas à la réception originale"
+
+#. module: msf_doc_import
+#: field:wizard.import.po.simulation.screen,with_ad:0
+msgid "File contains Analytic Distribution"
+msgstr "Le fichier contient une distribution analytique"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:366
+#, python-format
+msgid "Error during file to import parsing :: Error: %s"
+msgstr "Erreur durant le traitement du fichier importé :: Erreur : %s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:597
+#, python-format
+msgid "Line %s of the imported file: The header information must be on two columns : Column A for name of the field and column B for value."
+msgstr "Ligne %s du fichier importé : les informations de l'en-tête doivent être sur deux colonnes : La colonne A pour le nom du champ et la colonne B pour sa valeur."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1346
+#, python-format
+msgid "The import file is inconsistent. Line no. %s is not existing or was previously deleted"
+msgstr "Le fichier importé est incohérent. La ligne n° %s n'existe pas ou a été précédemment supprimée"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1348
+#, python-format
+msgid "The import file is inconsistent. The matching line is not existing or was previously deleted"
+msgstr "Le fichier importé est incohérent. La ligne correspondante n'existe pas ou a été précédemment supprimée"
+
+#. module: msf_supply_doc_export
+#: report:addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako:102
+msgid "Ext. Reference"
+msgstr "Réf. Externe"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2016-03-15 06:38:29 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2016-10-28 14:28:19 +0000
@@ -123,6 +123,23 @@
 class validated_purchase_order_report_xls(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(validated_purchase_order_report_xls, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+            'maxADLines': self.get_max_ad_lines,
+        })
+
+    def set_context(self, objects, data, ids, report_type = None):
+        super(validated_purchase_order_report_xls, self).set_context(objects, data, ids, report_type=report_type)
+        self.localcontext['need_ad'] = data.get('need_ad', True)
+
+    def get_max_ad_lines(self, order):
+        max_ad_lines = 0
+        for line in order.order_line:
+            if line.analytic_distribution_id:
+                if len(line.analytic_distribution_id.cost_center_lines) > max_ad_lines:
+                    max_ad_lines = len(line.analytic_distribution_id.cost_center_lines)
+
+        return max_ad_lines
 
 SpreadsheetReport('report.validated.purchase.order_xls', 'purchase.order', 'addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako', parser=validated_purchase_order_report_xls)
 
@@ -130,6 +147,23 @@
 class parser_validated_purchase_order_report_xml(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(parser_validated_purchase_order_report_xml, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+            'maxADLines': self.get_max_ad_lines,
+        })
+
+    def set_context(self, objects, data, ids, report_type = None):
+        super(parser_validated_purchase_order_report_xml, self).set_context(objects, data, ids, report_type=report_type)
+        self.localcontext['need_ad'] = data.get('need_ad', True)
+
+    def get_max_ad_lines(self, order):
+        max_ad_lines = 0
+        for line in order.order_line:
+            if line.analytic_distribution_id:
+                if len(line.analytic_distribution_id.cost_center_lines) > max_ad_lines:
+                    max_ad_lines = len(line.analytic_distribution_id.cost_center_lines)
+
+        return max_ad_lines
 
 class validated_purchase_order_report_xml(WebKitParser):
     def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):

=== modified file 'bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako	2015-01-28 14:08:10 +0000
+++ bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako	2016-10-28 14:28:19 +0000
@@ -98,7 +98,8 @@
     </Row>
     
     <Row>
-        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Line number*')}</Data></Cell>    
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Line number')}</Data></Cell>    
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Ext. Reference')}</Data></Cell>    
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code*')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Qty*')}</Data></Cell>
@@ -114,6 +115,7 @@
     % for line in o.move_lines:
     <Row>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.line_number or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.purchase_line_id and line.purchase_line_id.external_ref or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id and line.product_id.default_code or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id and line.product_id.name or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.product_qty or '')|x}</Data></Cell>

=== modified file 'bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako'
--- bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako	2014-01-15 11:12:34 +0000
+++ bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako	2016-10-28 14:28:19 +0000
@@ -15,6 +15,7 @@
         % for l in o.move_lines:
             <record>
                 <field name="line_number">${l.line_number or ''}</field>
+                <field name="external_ref">${l.purchase_line_id and l.purchase_line_id.external_ref or ''}</field>
                 <field name="product_id" key="default_code,name">
                     <field name="product_code">${l.product_id and l.product_id.default_code or ''}</field>
                     <field name="product_name">${l.product_id and l.product_id.name or ''}</field>

=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2014-01-10 10:50:00 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako	2016-10-28 14:28:19 +0000
@@ -32,6 +32,10 @@
         </Borders>
         <Protection />
     </Style>
+    <Style ss:ID="line_wb">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Protection ss:Protected="0" />
+    </Style>
     <Style ss:ID="line">
         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
         <Borders>
@@ -57,7 +61,8 @@
 ## ==================================== we loop over the purchase_order "objects" == purchase_order  ====================================================
 % for o in objects:
 <ss:Worksheet ss:Name="${"%s"%(o.name.split('/')[-1] or 'Sheet1')|x}" ss:Protected="1">
-## definition of the columns' size
+    ## definition of the columns' size
+<% max_ad_lines = maxADLines(o) %>
 <% nb_of_columns = 17 %>
 <Table x:FullColumns="1" x:FullRows="1">
 <Column ss:AutoFitWidth="1" ss:Width="120" />
@@ -165,7 +170,45 @@
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Message ESC Header')}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${o.message_esc or ''|x}</Data></Cell>
     </Row>
-    
+
+    % if need_ad and o.analytic_distribution_id:
+        <Row>
+            <Cell ss:MergeDown="1" ss:StyleID="header" ><Data ss:Type="String">${_('Analytic Distribution')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Destination')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Center')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('%')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Subtotal')}</Data></Cell>
+            % for x in range(1, len(o.analytic_distribution_id.cost_center_lines)):
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Destination')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Center')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('%')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Subtotal')}</Data></Cell>
+            % endfor
+        </Row>
+        <Row>
+        % for i, ccl in enumerate(o.analytic_distribution_id.cost_center_lines):
+            <Cell ss:Index="${(i*4+2)|x}" ss:StyleID="line" ><Data ss:Type="String">${(ccl.destination_id.code or '')|x}</Data></Cell>
+            <Cell ss:Index="${(i*4+3)|x}" ss:StyleID="line" ><Data ss:Type="String">${(ccl.analytic_id.code or '')|x}</Data></Cell>
+            <Cell ss:Index="${(i*4+4)|x}" ss:StyleID="line" ><Data ss:Type="Number">${(ccl.percentage or 0.00)|x}</Data></Cell>
+            <Cell ss:Index="${(i*4+5)|x}" ss:StyleID="line" ><Data ss:Type="Number">${((ccl.percentage/100.00)*o.amount_total or 0.00)|x}</Data></Cell>
+        % endfor
+        </Row>
+    % else:
+        <Row>
+            <Cell ss:MergeDown="1" ss:StyleID="header" ><Data ss:Type="String">${_('Analytic Distribution')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Destination')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Center')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('%')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Subtotal')}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:Index="2" ss:StyleID="line" />
+            <Cell ss:Index="3" ss:StyleID="line" />
+            <Cell ss:Index="4" ss:StyleID="line" />
+            <Cell ss:Index="5" ss:StyleID="line" />
+        </Row>
+    % endif
+
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Line number')}</Data></Cell>    
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Ext. Ref.')}</Data></Cell>    
@@ -186,8 +229,22 @@
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Project Ref')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('ESC Message 1')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('ESC Message 2')}</Data></Cell>
+        % if max_ad_lines:
+            % for x in range(1, max_ad_lines+1):
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Destination')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Center')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('%')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Subtotal')}</Data></Cell>
+            % endfor
+        % else:
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Destination')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Center')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('%')}</Data></Cell>
+            <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Subtotal')}</Data></Cell>
+        % endif
     </Row>
     % for line in o.order_line:
+    <% len_cc_lines = line.analytic_distribution_id and len(line.analytic_distribution_id.cost_center_lines) or 0 %>
     <Row>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.line_number or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.external_ref or '')|x}</Data></Cell>
@@ -222,6 +279,27 @@
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.fnct_project_ref or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+        % if need_ad:
+            % if line.analytic_distribution_id:
+                % for ccl in line.analytic_distribution_id.cost_center_lines:
+            <Cell ss:StyleID="line" ><Data ss:Type="String">${(ccl.destination_id.code or '')|x}</Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String">${(ccl.analytic_id.code or '')|x}</Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="Number">${(ccl.percentage or 0.00)|x}</Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="Number">${((ccl.percentage/100.00) * line.price_subtotal or 0.00)|x}</Data></Cell>
+                % endfor
+                % for x in range(0, max_ad_lines-len_cc_lines):
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+                % endfor
+            % endif
+        % else:
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
+        % endif
     </Row>
     % endfor
 </Table>

=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2014-11-05 09:11:22 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2016-10-28 14:28:19 +0000
@@ -42,6 +42,16 @@
         <field name="origin">${o.origin or ''|x}</field>
         <field name="project_ref">${o.fnct_project_ref or ''|x}</field>
         <field name="message_esc">${o.message_esc or ''|x}</field>
+        <field name="analytic_distribution_id">
+            % if need_ad and o.analytic_distribution_id:
+                % for ccl in o.analytic_distribution_id.cost_center_lines:
+                <field name="ad_destination_name">${(ccl.destination_id.name or '')|x}</field>
+                <field name="ad_cost_center_name">${(ccl.analytic_id.name or '')|x}</field>
+                <field name="ad_percentage">${(ccl.percentage or 0.00)|x}</field>
+                <field name="ad_subtotal">${((ccl.percentage/100.00)*o.amount_total or 0.00)|x}</field>
+                % endfor
+            % endif
+        </field>
         <field name="order_line">
         % for l in o.order_line:
             <record>
@@ -84,6 +94,16 @@
                 <field name="project_ref">${l.fnct_project_ref or ''|x}</field>
                 <field name="message_esc1"></field>
                 <field name="message_esc2"></field>
+                <field name="analytic_distribution_id">
+                % if need_ad and l.analytic_distribution_id:
+                        % for ccl in l.analytic_distribution_id.cost_center_lines:
+                        <field name="ad_destination_name">${(ccl.destination_id.name or '')|x}</field>
+                        <field name="ad_cost_center_name">${(ccl.analytic_id.name or '')|x}</field>
+                        <field name="ad_percentage">${(ccl.percentage or 0.00)|x}</field>
+                        <field name="ad_subtotal">${((ccl.percentage/100.00)*l.price_subtotal or 0.00)|x}</field>
+                        % endfor
+                % endif
+                </field>
             </record>
         % endfor
         </field>