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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-11-21 16:33:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-01-27 10:41:38 +0000
@@ -1477,7 +1477,7 @@
 msgid "Partner Form"
 msgstr "Formulaire du Partenaire"
 
-#. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock
+#. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock, stock_override
 #: selection:stock.move,order_category:0
 #: view:purchase.order:0
 #: selection:purchase.order,categ:0
@@ -1499,6 +1499,7 @@
 #: selection:sale.order.line,categ:0
 #: selection:internal.request.import,imp_categ:0
 #: selection:stock.reception.wizard,order_category:0
+#: code:addons/stock_override/report/report_stock_move.py:529
 msgid "Medical"
 msgstr "Médical"
 
@@ -1858,6 +1859,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:36
 #: field:supplier.performance.wizard,po_type_donation_exp:0
+#: code:addons/stock_override/report/report_stock_move.py:28
 #, python-format
 msgid "Donation before expiry"
 msgstr "Donation avant expiration"
@@ -3626,7 +3628,7 @@
 msgid "You cannot add any new move while validating the picking, rather you can split the lines prior to validation!"
 msgstr "Vous ne pouvez ajouter aucun nouveau mouvement tout en validant le picking. Veuillez plutôt fractionner les lignes avant Validation!"
 
-#. modules: purchase_allocation_report, service_purchasing, stock, purchase_followup, sale, msf_supply_doc_export, procurement_request
+#. modules: purchase_allocation_report, service_purchasing, stock, purchase_followup, sale, msf_supply_doc_export, procurement_request, stock_override
 #: report:addons/purchase_allocation_report/report/po_allocation_report.mako:158
 #: report:po.line.allocation.report:0
 #: field:purchase.order.followup,categ:0
@@ -3644,6 +3646,7 @@
 #: 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
+#: code:addons/stock_override/report/report_stock_move.py:826
 msgid "Order Category"
 msgstr "Catégorie de Commande"
 
@@ -4054,16 +4057,19 @@
 msgid "UoM Stock"
 msgstr "Stock UdM"
 
-#. modules: stock, sync_client, base, stock_override, stock_move_tracking
+#. modules: stock, sync_client, base, stock_move_tracking
 #: view:stock.move:0
 #: field:ir.translation,src:0
 #: view:sync.client.message_received:0
 #: view:sync.client.update_received:0
-#: report:addons/stock_override/report/report_stock_move_xls.mako:142
 #: report:tracking.move.report:0
+msgid "Source"
+msgstr "Origine"
+
+#. module: stock_override
 #: code:addons/stock_override/report/report_stock_move.py:759
 msgid "Source"
-msgstr "Origine"
+msgstr "Source"
 
 #. module: base
 #: field:ir.actions.report.xml,auto:0
@@ -5533,6 +5539,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:37
 #: field:supplier.performance.wizard,po_type_donation_st:0
+#: code:addons/stock_override/report/report_stock_move.py:29
 #, python-format
 msgid "Standard donation"
 msgstr "Donation normale"
@@ -10179,6 +10186,7 @@
 #: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:32
 #: field:supplier.performance.wizard,partner_type_intermission:0
+#: code:addons/stock_override/report/report_stock_move.py:23
 msgid "Intermission"
 msgstr "Intermission"
 
@@ -13054,6 +13062,7 @@
 #: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:30
 #: field:supplier.performance.wizard,partner_type_external:0
+#: code:addons/stock_override/report/report_stock_move.py:21
 msgid "External"
 msgstr "Externe"
 
@@ -20712,6 +20721,7 @@
 #: selection:stock.picking,partner_type_stock_picking:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:29
 #: field:supplier.performance.wizard,partner_type_section:0
+#: code:addons/stock_override/report/report_stock_move.py:20
 msgid "Inter-section"
 msgstr "Inter-section"
 
@@ -24287,6 +24297,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:38
 #: field:supplier.performance.wizard,po_type_loan:0
+#: code:addons/stock_override/report/report_stock_move.py:27
 #, python-format
 msgid "Loan"
 msgstr "Prêt"
@@ -30133,6 +30144,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:35
 #: field:supplier.performance.wizard,po_type_regular:0
+#: code:addons/stock_override/report/report_stock_move.py:27
 #, python-format
 msgid "Regular"
 msgstr "Normal"
@@ -45887,7 +45899,7 @@
 msgid "Activate the payroll feature"
 msgstr "Activer l'attribut Paie"
 
-#. modules: purchase, product, purchase_allocation_report, service_purchasing, consumption_calculation, sale, sales_followup, purchase_compare_rfq, sourcing, order_types, tender_flow, return_claim, purchase_followup, stock
+#. modules: purchase, product, purchase_allocation_report, service_purchasing, consumption_calculation, sale, sales_followup, purchase_compare_rfq, sourcing, order_types, tender_flow, return_claim, purchase_followup, stock, stock_override
 #: selection:real.average.consumption,categ:0
 #: selection:stock.move,order_category:0
 #: view:product.product:0
@@ -45912,6 +45924,7 @@
 #: selection:purchase.report,categ:0
 #: selection:tender,categ:0
 #: selection:stock.reception.wizard,order_category:0
+#: code:addons/stock_override/report/report_stock_move.py:532
 msgid "Transport"
 msgstr "Transport"
 
@@ -46312,6 +46325,7 @@
 #: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:31
 #: field:supplier.performance.wizard,partner_type_esc:0
+#: code:addons/stock_override/report/report_stock_move.py:22
 msgid "ESC"
 msgstr "ESC"
 
@@ -50991,11 +51005,12 @@
 msgid "Search Donation"
 msgstr "Rechercher Donation"
 
-#. modules: sale, account_override, account
+#. modules: sale, account_override, account, stock_override
 #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:127
 #: field:sale.donation.stock.moves,partner_type:0
 #: field:account.invoice,partner_type:0
 #: field:account.invoice.line,partner_type:0
+#: code:addons/stock_override/report/report_stock_move.py:826
 msgid "Partner Type"
 msgstr "Type de Partenaire"
 
@@ -52553,6 +52568,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:40
 #: field:supplier.performance.wizard,po_type_purchase_list:0
+#: code:addons/stock_override/report/report_stock_move.py:32
 #, python-format
 msgid "Purchase List"
 msgstr "Liste d'Achats"
@@ -53308,6 +53324,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:41
 #: field:supplier.performance.wizard,po_type_direct:0
+#: code:addons/stock_override/report/report_stock_move.py:33
 #, python-format
 msgid "Direct Purchase Order"
 msgstr "Bon de Commande Direct"
@@ -56396,6 +56413,7 @@
 #: selection:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:39
 #: field:supplier.performance.wizard,po_type_in_kind:0
+#: code:addons/stock_override/report/report_stock_move.py:27
 #, python-format
 msgid "In Kind Donation"
 msgstr "Donation en Nature"
@@ -56406,7 +56424,7 @@
 msgid "Other Types"
 msgstr "Autres Types"
 
-#. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock
+#. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock, stock_override
 #: selection:stock.move,order_category:0
 #: view:purchase.order:0
 #: selection:purchase.order,categ:0
@@ -56428,6 +56446,7 @@
 #: selection:sale.order.line,categ:0
 #: selection:internal.request.import,imp_categ:0
 #: selection:stock.reception.wizard,order_category:0
+#: code:addons/stock_override/report/report_stock_move.py:530
 msgid "Logistic"
 msgstr "Logistique"
 
@@ -61929,6 +61948,7 @@
 #: field:stock.reception.wizard,order_type:0
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:882
 #: report:addons/stock/report/stock_delivery_report_xls.mako:212
+#: code:addons/stock_override/report/report_stock_move.py:826
 msgid "Order Type"
 msgstr "Type de Commande"
 
@@ -74705,6 +74725,7 @@
 #: report:addons/stock/report/stock_reception_report_xls.mako:234
 #: report:tracking.move.report:0
 #: report:addons/stock/report/stock_delivery_report_xls.mako:210
+#: code:addons/stock_override/report/report_stock_move.py:826
 #, python-format
 msgid "Origin"
 msgstr "Origine"
@@ -90411,7 +90432,7 @@
 msgid "Export search result"
 msgstr "Exporter le résultat de la recherche"
 
-#. modules: purchase, tender_flow, msf_outgoing, reason_types_moves, product_asset, sale, purchase_allocation_report, base, order_types, specific_locations, return_claim, service_purchasing, purchase_followup, purchase_compare_rfq, sourcing, consumption_calculation, stock
+#. modules: purchase, tender_flow, msf_outgoing, reason_types_moves, product_asset, sale, purchase_allocation_report, base, order_types, specific_locations, return_claim, service_purchasing, purchase_followup, purchase_compare_rfq, sourcing, consumption_calculation, stock, stock_override
 #: selection:res.partner.address,type:0
 #: field:shipment,carrier_other:0
 #: field:shipment,consignee_other:0
@@ -90440,6 +90461,7 @@
 #: selection:sale.order.line,categ:0
 #: selection:internal.request.import,imp_categ:0
 #: selection:stock.reception.wizard,order_category:0
+#: code:addons/stock_override/report/report_stock_move.py:533
 msgid "Other"
 msgstr "Autre"
 
@@ -95651,6 +95673,7 @@
 #: selection:account.invoice.line,partner_type:0
 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:28
 #: field:supplier.performance.wizard,partner_type_internal:0
+#: code:addons/stock_override/report/report_stock_move.py:19
 #, python-format
 msgid "Internal"
 msgstr "Interne"
@@ -96649,7 +96672,7 @@
 msgid "America/Port-au-Prince"
 msgstr "Amériques/Port-au-Prince"
 
-#. modules: purchase, tender_flow, purchase_allocation_report, supplier_catalogue, service_purchasing, consumption_calculation, sale, msf_config_locations, procurement, sourcing, order_types, return_claim, purchase_compare_rfq, purchase_followup, stock
+#. modules: purchase, tender_flow, purchase_allocation_report, supplier_catalogue, service_purchasing, consumption_calculation, sale, msf_config_locations, procurement, sourcing, order_types, return_claim, purchase_compare_rfq, purchase_followup, stock, stock_override
 #: selection:real.average.consumption,categ:0
 #: model:stock.location,name:msf_config_locations.stock_location_service
 #: selection:stock.move,order_category:0
@@ -96674,6 +96697,7 @@
 #: view:tender:0
 #: selection:tender,categ:0
 #: selection:stock.reception.wizard,order_category:0
+#: code:addons/stock_override/report/report_stock_move.py:531
 msgid "Service"
 msgstr "Service"
 
@@ -103236,7 +103260,7 @@
 msgid "Specific Destination Location"
 msgstr "Zone de Destination Spécifique"
 
-#. module: stock
+#. module: stock, stock_override
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:206
 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:217
 #: field:stock.expired.damaged.report,nomen_manda_0:0
@@ -103244,6 +103268,7 @@
 #: 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
+#: code:addons/stock_override/report/report_stock_move.py:826
 msgid "Product Main Type"
 msgstr "Type Principal du Produit"
 

=== modified file 'bin/addons/stock_override/report/report_stock_move.py'
--- bin/addons/stock_override/report/report_stock_move.py	2019-10-30 16:33:21 +0000
+++ bin/addons/stock_override/report/report_stock_move.py	2020-01-27 10:41:38 +0000
@@ -15,6 +15,7 @@
 import tempfile
 import base64
 
+
 class report_stock_move(osv.osv):
     _name = "report.stock.move"
     _rec_name = 'location_id'
@@ -503,10 +504,35 @@
         )
 
     def getLines(self, cr, uid, datas, currency_id, context=None):
-
         if context is None:
             context = {}
 
+        PARTNER_TYPES = {
+            'internal': _('Internal'),
+            'section': _('Inter-section'),
+            'external': _('External'),
+            'esc': _('ESC'),
+            'intermission': _('Intermission'),
+        }
+
+        ORDER_TYPES = {
+            'regular': _('Regular'),
+            'donation_exp': _('Donation before expiry'),
+            'donation_st': _('Standard donation'),
+            'loan': _('Loan'),
+            'in_kind': _('In Kind Donation'),
+            'purchase_list': _('Purchase List'),
+            'direct': _('Direct Purchase Order'),
+        }
+
+        ORDER_CATEGORIES = {
+            'medical': _('Medical'),
+            'log': _('Logistic'),
+            'service': _('Service'),
+            'transport': _('Transport'),
+            'other': _('Other'),
+        }
+
         _logger = logging.getLogger('in.out.report')
         prod_obj = self.pool.get('product.product')
         curr_obj = self.pool.get('res.currency')
@@ -552,12 +578,19 @@
                     pick.name as pick_name,
                     m.date as date,
                     uom.name as uom_name,
+                    nom.name as nom_name,
                     t.standard_price as standard_price,
                     m.location_id as location_src_id,
                     m.location_dest_id as location_dest_id,
+                    par.name as partner_name,
+                    par.partner_type as partner_type,
                     m.reason_type_id as reason_type_id,
                     lot.name as lot_name,
                     lot.life_date as life_date,
+                    COALESCE(pick.origin, m.origin) as origin,
+                    pi.ref as pi_name,
+                    case when m.sale_line_id is not null and not so.procurement_request then so.order_type when m.purchase_line_id is not null then po.order_type end as order_type,
+                    case when m.sale_line_id is not null then so.categ when m.purchase_line_id is not null then po.categ end as order_category,
                     case when pick.subtype not in ('ppl', 'packing') then null when so.procurement_request then %s else pl.currency_id end as bug_pl
                 from
                     stock_move m
@@ -566,10 +599,16 @@
                     inner join product_template t on t.id = p.product_tmpl_id
                     left join stock_picking pick on m.picking_id = pick.id
                     left join stock_production_lot lot on lot.id = m.prodlot_id
-                    left join ir_translation trans on trans.name='product.template,name' and trans.res_id=t.id and lang=%s
+                    left join ir_translation trans on trans.name='product.template,name' and trans.res_id=t.id and trans.lang=%s
                     left join sale_order_line sol on m.sale_line_id = sol.id
                     left join sale_order so on sol.order_id = so.id
+                    left join purchase_order_line pol on m.purchase_line_id = pol.id
+                    left join purchase_order po on pol.order_id = po.id
                     left join product_pricelist pl on so.pricelist_id = pl.id
+                    left join product_nomenclature nom on nom.id = t.nomen_manda_0
+                    left join res_partner par on par.id = m.partner_id
+                    left join physical_inventory_discrepancy pi_discr on pi_discr.move_id = m.id
+                    left join physical_inventory pi on pi.id = pi_discr.inventory_id
                 where
                     m.id in %s
                 order by p.default_code, m.date asc, lot.name
@@ -607,7 +646,6 @@
                     else:
                         prod_stock = prod_stock_cache[move['product_id']]['stock']
 
-
                     if move['prodlot_id']:
                         ctx.update({'prodlot_id': move['prodlot_id'], 'from_strict_date': bn_stock_cache.get(move['prodlot_id'], {}).get('to_date', False)})
                         if ctx['to_date'] != ctx['from_strict_date']:
@@ -645,6 +683,7 @@
                         move['default_code'],
                         move['product_name'],
                         move['uom_name'],
+                        move['nom_name'],
                         move_date and datetime.datetime.strptime(move_date, '%Y-%m-%d %H:%M:%S') or '',
                         move['lot_name'] or '',
                         move['life_date'] and datetime.datetime.strptime(move['life_date'], '%Y-%m-%d'),
@@ -655,8 +694,13 @@
                         prod_stock,
                         location_info.get(move['location_src_id']),
                         location_info.get(move['location_dest_id']),
+                        move['partner_name'],
+                        PARTNER_TYPES.get(move['partner_type']) or '',
                         reason_info.get(move['reason_type_id']) or '',
-                        move['pick_name'] or move['move_name'] or '',
+                        move['pi_name'] or move['pick_name'] or move['move_name'] or '',
+                        move['pi_name'] and move['move_name'] or move['origin'] or '',
+                        ORDER_TYPES.get(move['order_type']) or '',
+                        ORDER_CATEGORIES.get(move['order_category']) or '',
                     ]
 
             raise StopIteration
@@ -726,6 +770,13 @@
                 """)
             row_style.borders = borders
 
+            row_left_style = easyxf("""
+                font: height 200;
+                font: name Calibri;
+                align: wrap on, vert center, horiz left;
+            """)
+            row_left_style.borders = borders
+
             date_time_format = easyxf(
                 """
                     font: height 200;
@@ -774,7 +825,7 @@
 
             row_count += 1
             pos = 0
-            headers = [(_('Product Code'), '', 25), (_('Product Description'), '', 70), (_('UoM'), '', 11),  (_('Stock Move Date'), date_time_format,20), (_('Batch'), '',30), (_('Exp Date'), date_format, 11), (_('Quantity'), '', 10), (_('Unit Price (%s)') % (currency.name,), '', 10), (_('Movement value (%s)') % (currency.name,) , '', 10), (_('BN stock after movement (instance)'), '', 10), (_('Total stock after movement (instance)'), '', 10),  (_('Source'), '', 40), (_('Destination'), '', 40), (_('Reason Type'), '', 30), (_('Document Ref.'), '', 40)]
+            headers = [(_('Product Code'), '', 25), (_('Product Description'), '', 70), (_('UoM'), '', 11),  (_('Product Main Type'), '', 11),  (_('Stock Move Date'), date_time_format,20), (_('Batch'), '',30), (_('Exp Date'), date_format, 11), (_('Quantity'), '', 10), (_('Unit Price (%s)') % (currency.name,), '', 10), (_('Movement value (%s)') % (currency.name,) , '', 10), (_('BN stock after movement (instance)'), '', 10), (_('Total stock after movement (instance)'), '', 10),  (_('Source'), '', 40), (_('Destination'), '', 40), (_('Partner'), '', 30), (_('Partner Type'), '', 15), (_('Reason Type'), '', 30), (_('Document Ref.'), '', 40), (_('Origin'), '', 70), (_('Order Type'), '', 15), (_('Order Category'), '', 11)]
 
             for header_row, col_type, size in headers:
                 sheet.col(pos).width = size * 256
@@ -793,7 +844,10 @@
                     if value and headers[col_count][1]:
                         style = headers[col_count][1]
                     else:
-                        style = row_style
+                        if col_count == 18:  # Change style on Origin column
+                            style = row_left_style
+                        else:
+                            style = row_style
                     sheet.write(row_count, col_count, value, style)
                     col_count += 1
                 #sheet.row(row_count).height = 60*20

=== removed file 'bin/addons/stock_override/report/report_stock_move_xls.mako.THIS'