Merge lp:~dorian-kemps/unifield-server/US-2109 into lp:unifield-server

[jftempo]

=== 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	2017-01-17 13:30:54 +0000
+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2018-08-10 09:51:51 +0000
@@ -269,9 +269,9 @@
         <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>
         % if l.type_change == 'del':
-            <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, 'chg_text') or '')|x}</Data></Cell>
         % else:
-            <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(l, 'type_change') or '')|x}</Data></Cell>
+            <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(l, 'chg_text') 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>

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-07-11 14:31:55 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-08-10 09:51:51 +0000
@@ -980,6 +980,7 @@
                         elif file_line[1] == 'split':
                             new_wl_id = wl_obj.copy(cr, uid, po_line,
                                                     {'type_change': 'split',
+                                                     'chg_text': _('Split\nQTY'),
                                                      'parent_line_id': po_line,
                                                      'imp_dcd': False,
                                                      'po_line_id': False}, context=context)
@@ -1203,7 +1204,10 @@
                             'in_currency': False,
                             'in_ext_ref': False,
                             'imp_discrepancy': 0.00,
-                            'change_ok': False}
+                            'change_ok': False,
+                            'chg_text': line.chg_text
+                                or line.type_change and dict(self._columns['type_change'].selection).get(line.type_change) or '',
+                            }
 
             if line.po_line_id:
                 l = line.po_line_id
@@ -1224,11 +1228,19 @@
 
                     prod_change = False
                     if res[line.id]['in_product_id'] and not line.imp_product_id or \
-                       not res[line.id]['in_product_id'] and line.imp_product_id or \
-                       res[line.id]['in_product_id'] != line.imp_product_id.id:
+                            not res[line.id]['in_product_id'] and line.imp_product_id or \
+                            res[line.id]['in_product_id'] != line.imp_product_id.id:
                         prod_change = True
+                        if not line.chg_text and line.imp_product_id or (not line.imp_product_id and line.in_comment):
+                            res[line.id]['chg_text'] += _('\nPROD')
                     qty_change = not(res[line.id]['in_qty'] == line.imp_qty)
+                    if not line.chg_text and (line.imp_product_id or (not line.imp_product_id and line.in_comment)) \
+                            and qty_change:
+                        res[line.id]['chg_text'] += _('\nQTY')
                     price_change = not(res[line.id]['in_price'] == line.imp_price)
+                    if not line.chg_text and (line.imp_product_id or (not line.imp_product_id and line.in_comment)) \
+                            and price_change:
+                        res[line.id]['chg_text'] += _('\nPRICE')
                     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]'
@@ -1308,7 +1320,7 @@
         'type_change': fields.selection([('', ''), ('error', 'Error'), ('new', 'New'),
                                          ('split', 'Split'), ('del', 'Del'),
                                          ('ignore', 'Ignore')],
-                                        string='CHG', readonly=True),
+                                        string='Change type', readonly=True),
         'imp_product_id': fields.many2one('product.product', string='Product',
                                           readonly=True),
         'imp_qty': fields.float(digits=(16,2), string='Qty', readonly=True),
@@ -1335,6 +1347,8 @@
                                           string='Parent line id',
                                           help='Use to split the good PO line',
                                           readonly=True),
+        'chg_text': fields.function(_get_line_info, method=True, multi='line', type='char', size=216, string='CHG',
+                                    readonly=True, store=True),
     }
 
     def get_error_msg(self, cr, uid, ids, context=None):

=== 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	2017-06-12 14:43:11 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2018-08-10 09:51:51 +0000
@@ -92,7 +92,8 @@
                                     <field name="in_line_number" invisible="1" />
                                     <field name="str_in_line_number" />
                                     <field name="in_ext_ref" />
-                                    <field name="type_change" />
+                                    <field name="type_change" invisible="1"/>
+                                    <field name="chg_text" />
                                     <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)]}" />
                                     <field name="imp_product_id" />

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-08-08 13:49:51 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-08-10 09:51:51 +0000
@@ -101219,6 +101219,7 @@
 msgid "Not Invoice"
 msgstr "Pas de Facture"
 
+<<<<<<< TREE
 #. module: consumption_calculation
 #: code:addons/consumption_calculation/expiry_calculation.py:740
 #: report:product.likely.expire.report_pdf:0
@@ -101424,3 +101425,36 @@
 #, python-format
 msgid "You can only have one draft shipment for a given address, please check %s"
 msgstr "Vous ne pouvez avoir qu'une seule Expédition en brouillon pour la même adresse, veuillez vérifier %s "
+=======
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:983
+#, python-format
+msgid "Split\n"
+"QTY"
+msgstr "Divisé\n"
+"QTÉ"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1239
+#, python-format
+msgid "\n"
+"QTY"
+msgstr "\n"
+"QTÉ"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1243
+#, python-format
+msgid "\n"
+"PRICE"
+msgstr "\n"
+"PRIX"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1235
+#, python-format
+msgid "\n"
+"PROD"
+msgstr "\n"
+"PROD"
+>>>>>>> MERGE-SOURCE