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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-08-08 14:10:40 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-08-09 14:01:53 +0000
@@ -3676,6 +3676,7 @@
 #: report:addons/stock/report/stock_reception_report_xls.mako:204
 #: report:addons/stock/report/stock_reception_report_xls.mako:230
 #: field:stock.reception.wizard,order_category:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:213
 msgid "Order Category"
 msgstr "Catégorie de Commande"
 
@@ -4790,7 +4791,11 @@
 #: view:account.invoice:0
 #: field:internal.request.import.line,ir_line_id:0
 #: report:addons/stock/report/stock_reception_report_xls.mako:236
+<<<<<<< TREE
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:883
+=======
+#: report:addons/stock/report/stock_delivery_report_xls.mako:215
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Line"
 msgstr "Ligne"
@@ -16768,6 +16773,8 @@
 #: report:addons/stock/report/stock_reception_report_xls.mako:245
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:228
 #: field:stock.picking,destinations_list:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:198
+#: report:addons/stock/report/stock_delivery_report_xls.mako:224
 #, python-format
 msgid "Destination Location"
 msgstr "Zone Destination"
@@ -19612,7 +19619,13 @@
 #: view:stock.move:0
 #: view:manage.expired.stock:0
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:227
+<<<<<<< TREE
 #: field:change.dest.location,src_location_id:0
+=======
+#: report:addons/stock/report/stock_delivery_report_xls.mako:194
+#: report:addons/stock/report/stock_delivery_report_xls.mako:223
+#: field:stock.delivery.wizard,location_id:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Source Location"
 msgstr "Zone Source"
@@ -26888,6 +26901,7 @@
 #: view:stock.reception.wizard:0
 #: view:products.situation.report:0
 #: view:supplier.performance.wizard:0
+#: view:stock.delivery.wizard:0
 msgid "Excel report"
 msgstr "Rapport Excel"
 
@@ -27269,7 +27283,11 @@
 #: field:stock.reserved.products,product_qty:0
 #: report:addons/specific_rules/report/report_stock_inventory_xls.mako:228
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:221
+<<<<<<< TREE
 #: report:tracking.move.report:0
+=======
+#: report:addons/stock/report/stock_delivery_report_xls.mako:219
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Qty"
 msgstr "Qté"
@@ -31133,6 +31151,7 @@
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:187
 #: field:supplier.performance.wizard,report_date:0
 #: code:addons/stock_override/report/report_stock_move.py:738
+#: report:addons/stock/report/stock_delivery_report_xls.mako:156
 msgid "Generated on"
 msgstr "Généré le"
 
@@ -38534,6 +38553,33 @@
 msgid "Male"
 msgstr "Masculin"
 
+<<<<<<< TREE
+=======
+#. modules: stock, account, sale, finance, purchase_followup, msf_homere_interface, procurement_request, specific_rules, order_types, msf_supply_doc_export
+#: report:hr.payment.order.report:0
+#: field:cash.request.expense,currency_id:0
+#: view:cash.request.liquidity.bank:0
+#: view:cash.request.liquidity.cash:0
+#: view:cash.request.liquidity.cheque:0
+#: field:cash.request.total.transfer.line,currency_id:0
+#: field:cash.request.transfer.currency,currency_id:0
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:242
+#: report:addons/sale/report/sale_loan_stock_moves_report_xls.mako:174
+#: field:physical.inventory.counting,currency_id:0
+#: field:physical.inventory.discrepancy,currency_id:0
+#: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:219
+#: field:internal.request.import,in_currency:0
+#: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:201
+#: report:addons/specific_rules/report/report_stock_inventory_xls.mako:204
+#: report:addons/stock/report/stock_reception_report_xls.mako:243
+#: report:addons/stock/report/stock_expired_damaged_report_xls.mako:225
+#: report:order.type.donation.certificate:0
+#: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:238
+#: report:addons/stock/report/stock_delivery_report_xls.mako:221
+msgid "Currency"
+msgstr "Devise"
+
+>>>>>>> MERGE-SOURCE
 #. module: sale
 #: code:addons/sale/sale_order.py:2979
 #: code:addons/sale/sale_order.py:2980
@@ -40695,6 +40741,7 @@
 #: report:addons/specific_rules/report/report_stock_inventory_xls.mako:148
 #: report:addons/stock/report/products_situation_report_xls.mako:218
 #: code:addons/stock_override/report/report_stock_move.py:759
+#: report:addons/stock/report/stock_delivery_report_xls.mako:218
 #, python-format
 msgid "UoM"
 msgstr "UdM"
@@ -43788,6 +43835,7 @@
 #: field:tender.line,product_code:0
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:233
 #: code:addons/stock_override/report/report_stock_move.py:759
+#: report:addons/stock/report/stock_delivery_report_xls.mako:216
 #, python-format
 msgid "Product Code"
 msgstr "Code Produit"
@@ -48726,6 +48774,7 @@
 #: view:stock.reception.wizard:0
 #: view:stock.expired.damaged.report:0
 #: view:supplier.performance.wizard:0
+#: view:stock.delivery.wizard:0
 msgid "Request parameters"
 msgstr "Paramètres de la requête"
 
@@ -49817,6 +49866,9 @@
 #: report:addons/stock/report/reserved_products_report_xls.mako:162
 #: report:addons/stock/report/stock_reception_report_xls.mako:200
 #: field:stock.reception.wizard,partner_id:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:186
+#: report:addons/stock/report/stock_delivery_report_xls.mako:211
+#: field:stock.delivery.wizard,partner_id:0
 #, python-format
 msgid "Partner"
 msgstr "Partenaire"
@@ -55092,8 +55144,10 @@
 #. module: consumption_calculation, stock
 #: field:product.history.consumption.month,date_from:0
 #: field:stock.reception.wizard,start_date:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:170
+#: field:stock.delivery.wizard,start_date:0
 msgid "Date from"
-msgstr "Date à partir de"
+msgstr "Date du"
 
 #. module: register_accounting
 #: code:addons/register_accounting/account_bank_statement.py:728
@@ -61987,11 +62041,15 @@
 #: report:addons/stock/report/stock_reception_report_xls.mako:225
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:215
 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:93
+<<<<<<< TREE
 #: code:addons/mission_stock/mission_stock.py:51
 #: code:addons/mission_stock/mission_stock.py:63
 #: code:addons/mission_stock/mission_stock.py:78
 #: code:addons/mission_stock/mission_stock.py:91
 #: code:addons/mission_stock/mission_stock.py:510
+=======
+#: report:addons/stock/report/stock_delivery_report_xls.mako:207
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Reference"
 msgstr "Référence"
@@ -62565,7 +62623,11 @@
 #: report:addons/stock/report/stock_reception_report_xls.mako:208
 #: report:addons/stock/report/stock_reception_report_xls.mako:229
 #: field:stock.reception.wizard,order_type:0
+<<<<<<< TREE
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:882
+=======
+#: report:addons/stock/report/stock_delivery_report_xls.mako:212
+>>>>>>> MERGE-SOURCE
 msgid "Order Type"
 msgstr "Type de Commande"
 
@@ -65209,8 +65271,10 @@
 #. module: consumption_calculation, stock
 #: field:product.history.consumption.month,date_to:0
 #: field:stock.reception.wizard,end_date:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:178
+#: field:stock.delivery.wizard,end_date:0
 msgid "Date to"
-msgstr "Date à"
+msgstr "Date au"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -75464,7 +75528,11 @@
 #: field:internal.request.import,in_origin:0
 #: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:205
 #: report:addons/stock/report/stock_reception_report_xls.mako:234
+<<<<<<< TREE
 #: report:tracking.move.report:0
+=======
+#: report:addons/stock/report/stock_delivery_report_xls.mako:210
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Origin"
 msgstr "Origine"
@@ -76313,6 +76381,7 @@
 #: report:addons/specific_rules/report/report_stock_inventory_xls.mako:147
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:234
 #: code:addons/stock_override/report/report_stock_move.py:759
+#: report:addons/stock/report/stock_delivery_report_xls.mako:217
 #, python-format
 msgid "Product Description"
 msgstr "Description Produit"
@@ -77098,6 +77167,7 @@
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:224
 #: code:addons/consumption_calculation/weekly_forecast_report.py:506
 #: report:order.type.donation.certificate:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:220
 #, python-format
 msgid "Unit Price"
 msgstr "Prix Unitaire"
@@ -81996,6 +82066,7 @@
 #: view:stock.expired.damaged.report:0
 #: report:addons/stock_override/report/report_stock_move_xls.mako:144
 #: code:addons/stock_override/report/report_stock_move.py:759
+#: report:addons/stock/report/stock_delivery_report_xls.mako:208
 msgid "Reason Type"
 msgstr "Raison - Type"
 
@@ -82035,6 +82106,7 @@
 #: field:report.stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 #: field:stock.reception.wizard,location_dest_id:0
+#: field:stock.delivery.wizard,location_dest_id:0
 msgid "Dest. Location"
 msgstr "Zone Dest."
 
@@ -89965,6 +90037,7 @@
 #: field:stock.expired.damaged.report,company_id:0
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:166
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:183
+#: report:addons/stock/report/stock_delivery_report_xls.mako:152
 msgid "DB/Instance name"
 msgstr "DB/Nom de l'Instance"
 
@@ -93194,6 +93267,7 @@
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:229
 #: field:internal.request.import,imp_creation_date:0
 #: report:addons/stock/report/products_situation_report_xls.mako:221
+#: report:addons/stock/report/stock_delivery_report_xls.mako:225
 msgid "Creation Date"
 msgstr "Date de Création"
 
@@ -102379,6 +102453,7 @@
 #. module: stock
 #: report:addons/stock/report/reserved_products_report_xls.mako:139
 #: report:addons/stock/report/stock_reception_report_xls.mako:177
+#: report:addons/stock/report/stock_delivery_report_xls.mako:167
 msgid "FILTERS"
 msgstr "FILTRES"
 
@@ -104329,6 +104404,8 @@
 #: field:stock.expired.damaged.report,nomen_manda_0:0
 #: report:addons/stock/report/stock_reception_report_xls.mako:212
 #: field:stock.reception.wizard,nomen_manda_0:0
+#: report:addons/stock/report/stock_delivery_report_xls.mako:190
+#: field:stock.delivery.wizard,nomen_manda_0:0
 msgid "Product Main Type"
 msgstr "Type Principal du Produit"
 
@@ -104356,6 +104433,7 @@
 
 #. module: stock
 #: report:addons/stock/report/stock_reception_report_xls.mako:231
+#: report:addons/stock/report/stock_delivery_report_xls.mako:214
 msgid "Order Priority"
 msgstr "Priorité de la Commande"
 
@@ -106875,6 +106953,7 @@
 #: field:stock.card.wizard.line,partner_or_loc:0
 msgid "Partner/Location"
 msgstr "Partneraire/Zone"
+<<<<<<< TREE
 
 #. module: msf_printed_documents
 #: code:addons/msf_printed_documents/report/report_product_labels.py:67
@@ -107228,3 +107307,36 @@
 #: field:hr.employee.activation,active_status:0
 msgid "Set selected employees as active"
 msgstr "Marquer les employés sélectionnés comme actifs"
+=======
+
+#. module: stock
+#: report:addons/stock/report/stock_delivery_report_xls.mako:149
+msgid "DELIVERIES REPORT"
+msgstr "RAPPORT DES LIVRAISONS"
+
+#. module: stock
+#: report:addons/stock/report/stock_delivery_report_xls.mako:104
+#: code:addons/stock/wizard/stock_delivery_wizard.py:139
+#: model:ir.actions.act_window,name:stock.action_stock_delivery_wizard
+#: model:ir.actions.report.xml,name:stock.report_stock_delivery_report_xls
+#: model:ir.ui.menu,name:stock.menu_stock_delivery_wizard
+#: view:stock.delivery.wizard:0
+#, python-format
+msgid "Deliveries Report"
+msgstr "Rapport des Livraisons"
+
+#. module: stock
+#: report:addons/stock/report/stock_delivery_report_xls.mako:209
+msgid "SHIP"
+msgstr "Expédition"
+
+#. module: stock
+#: report:addons/stock/report/stock_delivery_report_xls.mako:222
+msgid "Total Currency"
+msgstr "Total dans la Devise"
+
+#. module: stock
+#: report:addons/stock/report/stock_delivery_report_xls.mako:226
+msgid "Shipped Date"
+msgstr "Date d'Expédition"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/stock/__openerp__.py'
--- bin/addons/stock/__openerp__.py	2019-03-14 15:51:48 +0000
+++ bin/addons/stock/__openerp__.py	2019-08-09 14:01:53 +0000
@@ -86,6 +86,8 @@
         "report/stock_reception_report_view.xml",
         "report/stock_expired_damaged_report_view.xml",
         "report/products_situation_report_view.xml",
+        "wizard/stock_delivery_wizard_view.xml",
+        "report/stock_delivery_report_view.xml",
     ],
     'installable': True,
     'active': False,

=== modified file 'bin/addons/stock/report/__init__.py'
--- bin/addons/stock/report/__init__.py	2019-03-14 15:51:48 +0000
+++ bin/addons/stock/report/__init__.py	2019-08-09 14:01:53 +0000
@@ -34,3 +34,4 @@
 import stock_reception_report
 import stock_expired_damaged_report
 import products_situation_report
+import stock_delivery_report

=== modified file 'bin/addons/stock/report/products_situation_report_view.xml'
--- bin/addons/stock/report/products_situation_report_view.xml	2019-05-10 15:21:38 +0000
+++ bin/addons/stock/report/products_situation_report_view.xml	2019-08-09 14:01:53 +0000
@@ -54,7 +54,7 @@
             id="menu_products_situation_report"
             action="action_products_situation_report"
             parent="stock.next_id_61"
-            sequence="11"
+            sequence="12"
             />
 
         <report

=== added file 'bin/addons/stock/report/stock_delivery_report.py'
--- bin/addons/stock/report/stock_delivery_report.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/stock_delivery_report.py	2019-08-09 14:01:53 +0000
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+
+
+class stock_delivery_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(stock_delivery_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'parseDateXls': self._parse_date_xls,
+            'getMoves': self.get_moves,
+        })
+
+        self._order_iterator = 0
+        self._nb_orders = 0
+        if context.get('background_id'):
+            self.back_browse = self.pool.get('memory.background.report').browse(self.cr, self.uid, context['background_id'])
+        else:
+            self.back_browse = None
+
+    def _parse_date_xls(self, dt_str, is_datetime=True):
+        if not dt_str or dt_str == 'False':
+            return ''
+        if is_datetime:
+            dt_str = dt_str[0:10] if len(dt_str) >= 10 else ''
+        if dt_str:
+            dt_str += 'T00:00:00.000'
+        return dt_str
+
+    def get_moves(self, moves_ids):
+        move_obj = self.pool.get('stock.move')
+        res = []
+
+        self._nb_orders = len(moves_ids)
+
+        for move in move_obj.browse(self.cr, self.uid, moves_ids, context=self.localcontext):
+            pick = move.picking_id
+            ppl = pick.subtype == 'packing' and pick.previous_step_id or False
+            ship = pick.shipment_id
+            fo = pick.sale_id or False
+            prod = move.product_id
+            price = prod and prod.standard_price
+            currency = prod and prod.currency_id or False
+            curr_price = self.pool.get('res.currency').compute(self.cr, self.uid, move.price_currency_id.id, currency
+                                                               and currency.id or False, price, context=self.localcontext)
+            res.append({
+                'ref': ppl and ppl.name or pick.name,
+                'reason_type': ppl and ppl.reason_type_id.complete_name or pick.reason_type_id
+                               and pick.reason_type_id.complete_name or '',
+                'ship': ship and ship.name or '',
+                'origin': pick.origin or '',
+                'partner': pick.partner_id and pick.partner_id.name or '',
+                'fo': fo,
+                'header': ppl or pick,
+                'line_num': move.line_number,
+                'prod_code': prod and prod.default_code or '',
+                'prod_desc': prod and prod.name or '',
+                'prod_uom': move.product_uom and move.product_uom.name or '',
+                'qty': move.product_qty,
+                'price': price,
+                'currency': currency and currency.name or '',
+                'total_currency': price and curr_price * move.product_qty,
+                'location': ppl and move.backmove_id and move.backmove_id.location_id
+                            and move.backmove_id.location_id.name or move.location_id.name or '',
+                'destination': ppl and pick.partner_id.name or fo and not fo.procurement_request and fo.partner_id.name
+                               or move.location_dest_id.name or '',
+                'create_date': pick.date,
+                'shipped_date': ppl and ship and ship.shipment_expected_date or pick.date_done,
+            })
+
+            self._order_iterator += 1
+            if self.back_browse:
+                percent = float(self._order_iterator) / float(self._nb_orders)
+                self.pool.get('memory.background.report').update_percent(self.cr, self.uid, [self.back_browse.id], percent)
+
+        return res
+
+
+SpreadsheetReport(
+    'report.stock.delivery.report_xls',
+    'stock.delivery.wizard',
+    'stock/report/stock_delivery_report_xls.mako',
+    parser=stock_delivery_report
+)

=== added file 'bin/addons/stock/report/stock_delivery_report_view.xml'
--- bin/addons/stock/report/stock_delivery_report_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/stock_delivery_report_view.xml	2019-08-09 14:01:53 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <report
+            id="report_stock_delivery_report_xls"
+            name="stock.delivery.report_xls"
+            model="stock.delivery.wizard"
+            string="Deliveries Report"
+            file="stock/report/stock_delivery_report_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+        />
+
+    </data>
+</openerp>

=== added file 'bin/addons/stock/report/stock_delivery_report_xls.mako'
--- bin/addons/stock/report/stock_delivery_report_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/stock_delivery_report_xls.mako	2019-08-09 14:01:53 +0000
@@ -0,0 +1,281 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>Unifield</Author>
+  <LastAuthor>MSFUser</LastAuthor>
+  <Created>2014-04-16T22:36:07Z</Created>
+  <Company>Medecins Sans Frontieres</Company>
+  <Version>11.9999</Version>
+ </DocumentProperties>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>11640</WindowHeight>
+  <WindowWidth>15480</WindowWidth>
+  <WindowTopX>120</WindowTopX>
+  <WindowTopY>75</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+    <Style ss:ID="ssCell">
+        <Alignment ss:Vertical="Top" ss:WrapText="1"/>
+        <Font ss:Bold="1" />
+    </Style>
+
+    <!-- File header -->
+    <Style ss:ID="big_header">
+        <Font ss:Size="13" ss:Bold="1" />
+    </Style>
+    <Style ss:ID="file_header">
+        <Font ss:Size="13" ss:Bold="1" />
+        <Interior ss:Color="#F79646" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Line header -->
+    <Style ss:ID="line_header">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+        <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Interior ss:Color="#F79646" ss:Pattern="Solid"/>
+    </Style>
+    <Style ss:ID="line_header_center">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+        <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <Interior ss:Color="#F79646" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Lines -->
+     <Style ss:ID="line">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+         <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="line_center">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+         <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <NumberFormat ss:Format="#0"/>
+    </Style>
+    <Style ss:ID="line_center_nb">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+         <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="short_date">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <NumberFormat ss:Format="Short Date" />
+    </Style>
+    <Style ss:ID="general_date">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+        <Borders>
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+        </Borders>
+        <NumberFormat ss:Format="General Date" />
+    </Style>
+ </Styles>
+
+% for r in objects:
+<ss:Worksheet ss:Name="${_('Deliveries Report')|x}">
+    <Table x:FullColumns="1" x:FullRows="1">
+        ## Reference
+        <Column ss:AutoFitWidth="1" ss:Width="100.0" />
+        ## Reason Type
+        <Column ss:AutoFitWidth="1" ss:Width="115.0" />
+        ## SHIP
+        <Column ss:AutoFitWidth="1" ss:Width="80.0" />
+        ## Origin
+        <Column ss:AutoFitWidth="1" ss:Width="140.0" />
+        ## Partner
+        <Column ss:AutoFitWidth="1" ss:Width="110.0" />
+        ## Order Type
+        <Column ss:AutoFitWidth="1" ss:Width="60.0" />
+        ## Order Category
+        <Column ss:AutoFitWidth="1" ss:Width="60.0" />
+        ## Order Priority
+        <Column ss:AutoFitWidth="1" ss:Width="60.0" />
+        ## Line
+        <Column ss:AutoFitWidth="1" ss:Width="30.0" />
+        ## Product Code
+        <Column ss:AutoFitWidth="1" ss:Width="90.0" />
+        ## Product Description
+        <Column ss:AutoFitWidth="1" ss:Width="240.0" />
+        ## UoM
+        <Column ss:AutoFitWidth="1" ss:Width="40.0" />
+        ## Qty
+        <Column ss:AutoFitWidth="1" ss:Width="70.0" />
+        ## Unit Price
+        <Column ss:AutoFitWidth="1" ss:Width="60.0" />
+        ## Currency
+        <Column ss:AutoFitWidth="1" ss:Width="45.0" />
+        ## Total Currency
+        <Column ss:AutoFitWidth="1" ss:Width="70.0" />
+        ## Source Location
+        <Column ss:AutoFitWidth="1" ss:Width="90.0" />
+        ## Destination Location
+        <Column ss:AutoFitWidth="1" ss:Width="90.0" />
+        ## Creation Date
+        <Column ss:AutoFitWidth="1" ss:Width="120.0" />
+        ## Shipped Date
+        <Column ss:AutoFitWidth="1" ss:Width="110.0" />
+
+        ## WORKSHEET HEADER
+        <Row>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="1"><Data ss:Type="String">${_('DELIVERIES REPORT')|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('DB/Instance name')|x}</Data></Cell>
+            <Cell ss:StyleID="line_center"><Data ss:Type="String">${r.company_id and r.company_id.name or ''|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Generated on')|x}</Data></Cell>
+            % if isDateTime(r.report_date):
+            <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${parseDateXls(r.report_date)|n}</Data></Cell>
+            % else:
+            <Cell ss:StyleID="line_center"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+
+        <Row></Row>
+
+        <Row>
+            <Cell ss:StyleID="big_header" ss:MergeAcross="1"><Data ss:Type="String">${_('FILTERS')|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Date from')|x}</Data></Cell>
+            % if r.start_date and isDate(r.start_date):
+            <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${parseDateXls(r.start_date)|n}</Data></Cell>
+            % else:
+            <Cell ss:StyleID="line_center"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Date to')|x}</Data></Cell>
+            % if r.end_date and isDate(r.end_date):
+            <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${parseDateXls(r.end_date)|n}</Data></Cell>
+            % else:
+            <Cell ss:StyleID="line_center"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Partner')|x}</Data></Cell>
+            <Cell ss:StyleID="line_center"><Data ss:Type="String">${r.partner_id and r.partner_id.name or ''|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Product Main Type')|x}</Data></Cell>
+            <Cell ss:StyleID="line_center"><Data ss:Type="String">${r.nomen_manda_0 and r.nomen_manda_0.name or ''|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Source Location')|x}</Data></Cell>
+            <Cell ss:StyleID="line_center"><Data ss:Type="String">${r.location_id and r.location_id.name or ''|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="line"><Data ss:Type="String">${_('Destination Location')|x}</Data></Cell>
+            <Cell ss:StyleID="line_center"><Data ss:Type="String">${r.location_dest_id and r.location_dest_id.name or ''|x}</Data></Cell>
+        </Row>
+
+        <Row></Row>
+
+        ## DATA HEADERS
+        <%
+        headers_list = [
+            _('Reference'),
+            _('Reason Type'),
+            _('SHIP'),
+            _('Origin'),
+            _('Partner'),
+            _('Order Type'),
+            _('Order Category'),
+            _('Order Priority'),
+            _('Line'),
+            _('Product Code'),
+            _('Product Description'),
+            _('UoM'),
+            _('Qty'),
+            _('Unit Price'),
+            _('Currency'),
+            _('Total Currency'),
+            _('Source Location'),
+            _('Destination Location'),
+            _('Creation Date'),
+            _('Shipped Date'),
+        ]
+        %>
+        <Row>
+        % for h in headers_list:
+            <Cell ss:StyleID="line_header_center"><Data ss:Type="String">${h|x}</Data></Cell>
+        % endfor
+        </Row>
+
+        % for move in sorted(getMoves(r.moves_ids), key=lambda x: (x['shipped_date'], x['ref'], x['line_num'], x['prod_code'])):
+            <Row ss:Height="12.0">
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['ref']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['reason_type']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['ship']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['origin']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['partner']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['fo'] and getSel(move['fo'], 'order_type') or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['header'] and getSel(move['header'], 'order_category') or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['fo'] and getSel(move['fo'], 'priority') or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['line_num']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['prod_code']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['prod_desc']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['prod_uom']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${move['qty']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center_nb"><Data ss:Type="Number">${move['price']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['currency']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center_nb"><Data ss:Type="Number">${move['total_currency']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['location']|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['destination']|x}</Data></Cell>
+                % if move['create_date'] and isDateTime(move['create_date']):
+                <Cell ss:StyleID="general_date"><Data ss:Type="DateTime">${move['create_date'][:10]|n}T${move['create_date'][-8:]|n}.000</Data></Cell>
+                % else:
+                <Cell ss:StyleID="line_center"><Data ss:Type="String"></Data></Cell>
+                % endif
+                % if move['shipped_date'] and isDateTime(move['shipped_date']):
+                <Cell ss:StyleID="general_date"><Data ss:Type="DateTime">${move['shipped_date'][:10]|n}T${move['shipped_date'][-8:]|n}.000</Data></Cell>
+                % else:
+                <Cell ss:StyleID="line_center"><Data ss:Type="String"></Data></Cell>
+                % endif
+            </Row>
+        % endfor
+
+    </Table>
+</ss:Worksheet>
+% endfor
+</Workbook>

=== modified file 'bin/addons/stock/report/stock_expired_damaged_report_view.xml'
--- bin/addons/stock/report/stock_expired_damaged_report_view.xml	2019-01-18 14:58:31 +0000
+++ bin/addons/stock/report/stock_expired_damaged_report_view.xml	2019-08-09 14:01:53 +0000
@@ -117,7 +117,7 @@
             id="menu_stock_expired_damaged_report"
             action="action_stock_expired_damaged_report"
             parent="stock.next_id_61"
-            sequence="10"
+            sequence="11"
             />
 
         <report

=== modified file 'bin/addons/stock/wizard/__init__.py'
--- bin/addons/stock/wizard/__init__.py	2019-02-11 09:51:38 +0000
+++ bin/addons/stock/wizard/__init__.py	2019-08-09 14:01:53 +0000
@@ -40,5 +40,6 @@
 import manage_expired_stock
 import reserved_products_wizard
 import stock_reception_wizard
+import stock_delivery_wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== added file 'bin/addons/stock/wizard/stock_delivery_wizard.py'
--- bin/addons/stock/wizard/stock_delivery_wizard.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/stock_delivery_wizard.py	2019-08-09 14:01:53 +0000
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+from order_types import ORDER_CATEGORY
+
+import time
+
+
+class stock_delivery_wizard(osv.osv_memory):
+    _name = 'stock.delivery.wizard'
+    _rec_name = 'report_date'
+
+    _columns = {
+        'report_date': fields.datetime(string='Date of the demand', readonly=True),
+        'company_id': fields.many2one('res.company', string='Company', readonly=True),
+        'moves_ids': fields.text(string='Moves', readonly=True),
+        'start_date': fields.date(string='Date from'),
+        'end_date': fields.date(string='Date to'),
+        'partner_id': fields.many2one('res.partner', string='Partner'),
+        'nomen_manda_0': fields.many2one('product.nomenclature', 'Product Main Type'),
+        'location_id': fields.many2one('stock.location', 'Source Location', select=True),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', select=True),
+    }
+
+    _defaults = {
+        'report_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'company_id': lambda self, cr, uid, ids, c={}: self.pool.get('res.users').browse(cr, uid, uid).company_id.id,
+    }
+
+    def get_values(self, cr, uid, ids, context=None):
+        '''
+        Retrieve the data according to values in wizard
+        '''
+        move_obj = self.pool.get('stock.move')
+        ir_data = self.pool.get('ir.model.data')
+
+        dispatch_location = ir_data.get_object_reference(cr, uid, 'msf_outgoing', 'stock_location_dispatch')[1]
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for wizard in self.browse(cr, uid, ids, context=context):
+            move_domain = [('picking_id.type', '=', 'out'), ('product_qty', '!=', 0), '|']
+            out_domain = [
+                '&', '&',
+                ('state', '=', 'done'),
+                ('picking_id.subtype', '=', 'standard'),
+                ('picking_id.state', 'in', ['done', 'delivered'])
+            ]
+            ppl_domain = [
+                '&', '&', '&', '&',
+                ('location_dest_id', '!=', dispatch_location),
+                ('picking_id.previous_step_id.state', '=', 'done'),
+                ('picking_id.subtype', '=', 'packing'),
+                ('picking_id.shipment_id', '!=', 'f'),
+                '|', '&', ('picking_id.shipment_id.parent_id', '=', None), ('picking_id.shipment_id.state', '=', 'draft'),
+                    '&', ('picking_id.shipment_id.parent_id', '!=', 'f'), ('picking_id.shipment_id.state', '!=', 'draft'),
+            ]
+
+            if wizard.start_date:
+                out_domain.insert(0, '&')
+                out_domain.append(('picking_id.date_done', '>=', wizard.start_date))
+                ppl_domain.insert(0, '&')
+                ppl_domain.append(('picking_id.shipment_id.shipment_expected_date', '>=', wizard.start_date))
+
+            if wizard.end_date:
+                out_domain.insert(0, '&')
+                out_domain.append(('picking_id.date_done', '<=', wizard.end_date))
+                ppl_domain.insert(0, '&')
+                ppl_domain.append(('picking_id.shipment_id.shipment_expected_date', '<=', wizard.end_date))
+
+            if wizard.location_id:
+                out_domain.insert(0, '&')
+                out_domain.append(('location_id', '=', wizard.location_id.id))
+                ppl_domain.insert(0, '&')
+                ppl_domain.append(('backmove_id.location_id', '=', wizard.location_id.id))
+
+            move_domain.extend(out_domain)
+            move_domain.extend(ppl_domain)
+
+            if wizard.partner_id:
+                move_domain.append(('picking_id.partner_id', '=', wizard.partner_id.id))
+
+            if wizard.nomen_manda_0:
+                move_domain.append(('product_id.nomen_manda_0', '=', wizard.nomen_manda_0.id))
+
+            if wizard.location_dest_id:
+                move_domain.append(('location_dest_id', '=', wizard.location_dest_id.id))
+
+            move_ids = move_obj.search(cr, uid, move_domain, order='picking_id, line_number', context=context)
+
+            if not move_ids:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('No data found with these parameters'),
+                )
+
+            self.write(cr, uid, [wizard.id], {'moves_ids': move_ids}, context=context)
+
+        return True
+
+    def print_excel(self, cr, uid, ids, context=None):
+        '''
+        Retrieve the data according to values in wizard
+        and print the report in Excel format.
+        '''
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        self.get_values(cr, uid, ids, context=context)
+
+        background_id = self.pool.get('memory.background.report').create(cr, uid, {
+            'file_name': _('Deliveries Report'),
+            'report_name': 'stock.delivery.report_xls',
+        }, context=context)
+        context['background_id'] = background_id
+        context['background_time'] = 3
+
+        data = {'ids': ids, 'context': context}
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'stock.delivery.report_xls',
+            'datas': data,
+            'context': context,
+        }
+
+
+stock_delivery_wizard()

=== added file 'bin/addons/stock/wizard/stock_delivery_wizard_view.xml'
--- bin/addons/stock/wizard/stock_delivery_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/stock_delivery_wizard_view.xml	2019-08-09 14:01:53 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <data>
+
+        <record id="stock_delivery_wizard_form_view" model="ir.ui.view">
+            <field name="name">stock.delivery.wizard.form.view</field>
+            <field name="model">stock.delivery.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Deliveries Report">
+                    <separator colspan="4" string="Request parameters" />
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="partner_id" />
+                    <field name="nomen_manda_0" domain="[('level', '=', '0'), ('type', '=', 'mandatory')]" widget="selection" />
+                    <field name="location_id" domain="[('usage', '=', 'internal')]" />
+                    <field name="location_dest_id" domain="[('usage', '!=', 'view')]"/>
+                    <separator colspan="4" string="Actions" />
+                    <button name="print_excel" string="Excel report" icon="gtk-print" type="object" colspan="4" />
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_delivery_wizard" model="ir.actions.act_window">
+            <field name="name">Deliveries Report</field>
+            <field name="res_model">stock.delivery.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_stock_delivery_wizard"
+            action="action_stock_delivery_wizard"
+            parent="stock.next_id_61"
+            sequence="10"
+            />
+
+    </data>
+
+</openerp>