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

[jftempo]

=== modified file 'bin/addons/kit/__openerp__.py'
--- bin/addons/kit/__openerp__.py	2017-09-28 14:05:02 +0000
+++ bin/addons/kit/__openerp__.py	2019-06-12 15:17:56 +0000
@@ -46,6 +46,7 @@
         'security/ir.model.access.csv',
         'wizard/split_move_view.xml',
         'wizard/kit_mass_import_view.xml',
+        'report/kit_mass_import_export_view.xml'
     ],
     "demo_xml": [],
     'test': [
 
=== modified file 'bin/addons/kit/report/__init__.py'
--- bin/addons/kit/report/__init__.py	2013-09-13 09:16:03 +0000
+++ bin/addons/kit/report/__init__.py	2019-06-12 15:17:56 +0000
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import kit_report
+import kit_mass_impor_export
 
=== added file 'bin/addons/kit/report/kit_mass_impor_export.py'
--- bin/addons/kit/report/kit_mass_impor_export.py	1970-01-01 00:00:00 +0000
+++ bin/addons/kit/report/kit_mass_impor_export.py	2019-06-12 15:17:56 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 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/>.
+#
+##############################################################################
+
+
+import time
+
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+
+
+class kit_mass_import_export(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(kit_mass_import_export, self).__init__(cr, uid, name, context=context)
+        self.cr = cr
+        self.uid = uid
+        self.localcontext.update({
+        })
+
+
+class kit_mass_import_export_xls(SpreadsheetReport):
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse,
+                 header='external', store=False):
+        super(kit_mass_import_export_xls, self).__init__(name, table, rml=rml, parser=parser, header=header, store=store)
+
+    def create(self, cr, uid, ids, data, context=None):
+        a = super(kit_mass_import_export_xls, self).create(cr, uid, ids, data, context)
+        return (a[0], 'xls')
+
+
+kit_mass_import_export_xls(
+    'report.kit_mass_import_export',
+    'kit.mass.import',
+    'addons/kit/report/kit_mass_import_export_xls.mako',
+    parser=kit_mass_import_export,
+    header=False)
 
=== added file 'bin/addons/kit/report/kit_mass_import_export_view.xml'
--- bin/addons/kit/report/kit_mass_import_export_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/kit/report/kit_mass_import_export_view.xml	2019-06-12 15:17:56 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+        <report
+            id="kit_mass_import_export"
+            string="Theoretical Kit Template"
+            model="kit.mass.import"
+            name="kit_mass_import_export"
+            file="kit/report/kit_mass_import_export_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+         />
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'bin/addons/kit/report/kit_mass_import_export_xls.mako'
--- bin/addons/kit/report/kit_mass_import_export_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/kit/report/kit_mass_import_export_xls.mako	2019-06-12 15:17:56 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>MSFUser</Author>
+  <LastAuthor>MSFUser</LastAuthor>
+  <Created>2012-06-18T15:46:09Z</Created>
+  <Company>Medecins Sans Frontieres</Company>
+  <Version>11.9999</Version>
+ </DocumentProperties>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>13170</WindowHeight>
+  <WindowWidth>19020</WindowWidth>
+  <WindowTopX>120</WindowTopX>
+  <WindowTopY>60</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+<Styles>
+    <Style ss:ID="big_header">
+        <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+    </Style>
+    <Style ss:ID="header">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+        <Borders>
+          <Border ss:Position="Bottom" 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" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+    </Style>
+    <Style ss:ID="line">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Borders>
+          <Border ss:Position="Bottom" 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" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+    </Style>
+    <Style ss:ID="line_left">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+        <Borders>
+          <Border ss:Position="Bottom" 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" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+    </Style>
+    <Style ss:ID="line_bold">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+        <Borders>
+          <Border ss:Position="Bottom" 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" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+        <Font ss:Bold="1" />
+    </Style>
+    <Style ss:ID="line_red">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Borders>
+          <Border ss:Position="Bottom" 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" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+        <Font ss:Color="#ff0000"/>
+    </Style>
+    <Style ss:ID="short_date">
+     <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+     <Borders>
+      <Border ss:Position="Bottom" 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"/>
+      <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+     </Borders>
+     <NumberFormat ss:Format="Short Date"/>
+    </Style>
+</Styles>
+
+% for o in objects:
+<ss:Worksheet ss:Name="${_('Theoretical Kit Template')|x}">
+<Table x:FullColumns="1" x:FullRows="1">
+    ## Kit Code
+    <Column ss:AutoFitWidth="1" ss:Width="85.75" />
+    ## Kit Description
+    <Column ss:AutoFitWidth="1" ss:Width="250.75" />
+    ## Kit Version
+    <Column ss:AutoFitWidth="1" ss:Width="50.75" />
+    ## Active
+    <Column ss:AutoFitWidth="1" ss:Width="50.75" />
+    ## Module
+    <Column ss:AutoFitWidth="1" ss:Width="80.0" />
+    ## Product Code
+    <Column ss:AutoFitWidth="1" ss:Width="85.75" />
+    ## Product Description
+    <Column ss:AutoFitWidth="1" ss:Width="200.75" />
+    ## Product Qty
+    <Column ss:AutoFitWidth="1" ss:Width="75.0" />
+    ## Product UoM
+    <Column ss:AutoFitWidth="1" ss:Width="50.75" />
+
+    <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Kit Code')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Kit Description')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Kit Version')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Active')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Module')}</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>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product UoM')}</Data></Cell>
+    </Row>
+</Table>
+</ss:Worksheet>
+% endfor
+</Workbook>
 
=== modified file 'bin/addons/kit/wizard/kit_mass_import.py'
--- bin/addons/kit/wizard/kit_mass_import.py	2015-04-02 14:03:07 +0000
+++ bin/addons/kit/wizard/kit_mass_import.py	2019-06-12 15:17:56 +0000
@@ -67,9 +67,6 @@
             size=128,
             string='Template filename',
         ),
-        'show_template': fields.boolean(
-            string='Show template',
-        ),
         'state': fields.selection(
             selection=[
                 ('draft', 'Not started'),
@@ -122,31 +119,12 @@
         if context is None:
             context = {}
 
-        columns_header = [
-            (_('Kit Code'), 'string'),
-            (_('Kit Description'), 'string'),
-            (_('Kit Version'), 'string'),
-            (_('Active'), 'string'),
-            (_('Module'), 'string'),
-            (_('Product Code'), 'string'),
-            (_('Product Description'), 'string'),
-            (_('Product Qty'), 'string'),
-            (_('Product UoM'), 'string'),
-        ]
-        default_template = SpreadsheetCreator(
-            'Template of import',
-            columns_header,
-            [],)
-        template = base64.encodestring(default_template.get_xml(
-            default_filters=['decode.utf8']))
-
-        self.write(cr, uid, ids, {
-            'template_file': template,
-            'template_filename': 'template.xls',
-            'show_template': True,
-        }, context=context)
-
-        return {}
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'kit_mass_import_export',
+            'datas': {'target_filename': _('Theoretical Kit Template')},
+            'context': context,
+        }
 
     def get_value_from_excel(self, cr, uid, file_to_import, context=None):
         """
 
=== modified file 'bin/addons/kit/wizard/kit_mass_import_view.xml'
--- bin/addons/kit/wizard/kit_mass_import_view.xml	2015-03-24 15:47:52 +0000
+++ bin/addons/kit/wizard/kit_mass_import_view.xml	2019-06-12 15:17:56 +0000
@@ -10,16 +10,13 @@
                 <form string="Theoretical Kit mass import">
                     <field name="display_warning_message" invisible="1" />
                     <field name="display_error_message" invisible="1" />
-                    <field name="show_template" invisible="1" />
                     <separator colspan="4" string="Information" />
                     <field name="name" readonly="1" />
                     <newline />
                     <field name="file_to_import" filename="filename" accept="application/vnd.ms-excel,application/xml"/>
                     <field name="filename" invisible="1" />
                     <group colspan="2" col="2" attrs="{'invisible': [('state', '!=', 'draft')]}">
-                        <field name="template_file" filename="template_filename" attrs="{'invisible': [('show_template', '=', False)]}" />
-                        <field name="template_filename" invisible="1" />
-                        <button name="get_template" string="Get template" colspan="2" type="object" attrs="{'invisible': [('show_template', '=', True)]}" />
+                        <button name="get_template" string="Get template" colspan="2" type="object" />
                     </group>
                     <group colspan="4" col="4" name="check_messages" attrs="{'invisible': [('state', '!=', 'check_error')]}">
                         <html>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-06-04 19:13:17 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-06-12 15:17:56 +0000
@@ -17748,7 +17748,7 @@
 
 #. modules: threshold_value, procurement_auto, supplier_catalogue, consumption_calculation, kit, stock_forecast, procurement, msf_supply_doc_export, msf_doc_import
 #: code:addons/consumption_calculation/consumption_calculation.py:482
-#: code:addons/kit/wizard/kit_mass_import.py:134
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:119
 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:43
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:69
 #: report:addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako:177
@@ -19397,7 +19397,7 @@
 msgstr "ID de l'enregistrement parent"
 
 #. module: kit
-#: code:addons/kit/wizard/kit_mass_import.py:128
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:113
 #: field:composition.item,item_kit_version:0
 #, python-format
 msgid "Kit Version"
@@ -23275,10 +23275,10 @@
 msgstr "Le fuseau horaire de l'utilisateur, utilisé pour calculer les conversions horaires entre le serveur et le client"
 
 #. module: kit
-#: code:addons/kit/wizard/kit_mass_import.py:127
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:112
 #, python-format
 msgid "Kit Description"
-msgstr "Kit Description"
+msgstr "Description du Kit"
 
 #. module: msf_profile
 #: field:res.groups,is_an_admin_profile:0
@@ -38064,12 +38064,13 @@
 msgstr "Transport type"
 
 #. modules: msf_doc_import, kit
-#: code:addons/kit/wizard/kit_mass_import.py:133
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:118
+#: code:addons/kit/wizard/kit_mass_import.py:130
 #: code:addons/msf_doc_import/wizard/__init__.py:100
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:68
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:62
 #, python-format
 msgid "Product Qty"
-msgstr "Product Qty"
+msgstr "Qté du Produit"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -44193,7 +44194,7 @@
 #: report:addons/consumption_calculation/report/report_incoming_consumption_xls.mako:69
 #: code:addons/consumption_calculation/wizard/wizard_export_fmc_rac.py:38
 #: report:product.likely.expire.report_pdf:0
-#: code:addons/kit/wizard/kit_mass_import.py:131
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:116
 #: report:addons/msf_supply_doc_export/report/report_internal_move_xls.mako:68
 #: report:addons/msf_supply_doc_export/report/report_real_composition_kit_xls.mako:65
 #: report:addons/msf_supply_doc_export/report/stock_inventory_xls.mako:59
@@ -55469,11 +55470,6 @@
 msgid "Manufacturer Ref."
 msgstr "Manufacturer Ref."
 
-#. module: kit
-#: field:kit.mass.import,show_template:0
-msgid "Show template"
-msgstr "Montrer le modèle"
-
 #. modules: msf_doc_import, msf_outgoing
 #: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:151
 #: field:wizard.import.in.line.simulation.screen,move_uom_id:0
@@ -60257,7 +60253,7 @@
 #. module: kit
 #: view:kit.mass.import:0
 msgid "Get template"
-msgstr "Get template"
+msgstr "Obtenir le modèle"
 
 #. module: product
 #: field:product.template,rental:0
@@ -65077,7 +65073,7 @@
 #: field:ir.module.module.dependency,module_id:0
 #: report:ir.module.reference:0
 #: field:ir.translation,module:0
-#: code:addons/kit/wizard/kit_mass_import.py:130
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:115
 #: field:assign.to.kit,module_assign_to_kit:0
 #: view:composition.item:0
 #: field:composition.item,item_module:0
@@ -73032,7 +73028,7 @@
 #: field:sync.client.sync_server_connection,active:0
 #: field:threshold.value,active:0
 #: field:account.period,active:0
-#: code:addons/kit/wizard/kit_mass_import.py:129
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:114
 #: view:msf.instance:0
 #: field:automated.export,active:0
 #: field:product.heat_sensitive,active:0
@@ -75763,7 +75759,7 @@
 msgstr "Approvisionnement- Méthode"
 
 #. module: kit
-#: code:addons/kit/wizard/kit_mass_import.py:126
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:111
 #, python-format
 msgid "Kit Code"
 msgstr "Code Kit"
@@ -77002,7 +76998,7 @@
 #: report:addons/consumption_calculation/report/report_incoming_consumption_xls.mako:70
 #: report:addons/consumption_calculation/report/report_real_consumption_xls.mako:70
 #: report:product.likely.expire.report_pdf:0
-#: code:addons/kit/wizard/kit_mass_import.py:132
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:117
 #: code:addons/msf_doc_import/wizard/__init__.py:30
 #: code:addons/msf_doc_import/wizard/__init__.py:57
 #: code:addons/msf_doc_import/wizard/__init__.py:67
@@ -106827,3 +106823,10 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+#. module: kit
+#: report:addons/kit/report/kit_mass_import_export_xls.mako:89
+#: code:addons/kit/wizard/kit_mass_import.py:149
+#: model:ir.actions.report.xml,name:kit.kit_mass_import_export
+#, python-format
+msgid "Theoretical Kit Template"
+msgstr "Modèle du Kit Théorique"