Merge lp:~unifield-team/unifield-server/us-3478-3479 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-10-09 16:01:14 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-10-26 10:06:24 +0000
@@ -99629,3 +99629,217 @@
 #, python-format
 msgid "You can't delete this FX rate as the period \"%s\" isn't in Draft state."
 msgstr "Vous ne pouvez pas supprimer ce taux de change car la période \"%s\" n'est pas en statut Brouillon."
+
+#. modules: purchase, purchase_override, procurement_request
+#: field:sale.order.line,original_price:0
+#: field:purchase.order.line,original_price:0
+#: field:purchase.order.merged.line,original_price:0
+msgid "Original Price"
+msgstr "Prix d'Origine"
+
+#. modules: purchase, purchase_override, procurement_request
+#: field:sale.order.line,original_product:0
+#: field:purchase.order.line,original_product:0
+#: field:purchase.order.merged.line,original_product:0
+msgid "Original Product"
+msgstr "Produit d'Origine"
+
+#. modules: purchase, purchase_override, procurement_request
+#: field:sale.order.line,original_uom:0
+#: field:purchase.order.line,original_uom:0
+#: field:purchase.order.merged.line,original_uom:0
+msgid "Original UoM"
+msgstr "UdM d'Origine"
+
+#. modules: purchase, purchase_followup, purchase_override
+#: field:purchase.order.line,original_currency_id:0
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:244
+#: field:purchase.order.merged.line,original_currency_id:0
+msgid "Original Currency"
+msgstr "Devise d'Origine"
+
+#. modules: purchase, purchase_override, procurement_request
+#: field:sale.order.line,original_changed:0
+#: field:purchase.order.line,original_changed:0
+#: field:purchase.order.merged.line,original_changed:0
+msgid "Changed"
+msgstr "Changé"
+
+#. modules: sales_followup, purchase, purchase_followup, purchase_override, procurement_request
+#: field:sale.order.line,original_qty:0
+#: field:purchase.order.line,original_qty:0
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:239
+#: field:purchase.order.merged.line,original_qty:0
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:231
+msgid "Original Qty"
+msgstr "Qté d'Origine"
+
+#. module: sales_followup
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:236
+msgid "Original Subtotal"
+msgstr "Sous-Total d'Origine"
+
+#. module: purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:246
+msgid "Original Price in functional currency"
+msgstr "Prix d'Origine en devise fonctionnelle"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:240
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:232
+msgid "Original UoM"
+msgstr "UdM d'Origine"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:236
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:228
+msgid "Original Code"
+msgstr "Code d'Origine"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:243
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:234
+msgid "Original Unit Price"
+msgstr "Prix Unitaire d'Origine"
+
+#. module: purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:248
+msgid "Original Subtotal (functional currency)"
+msgstr "Sous-Total d'Origine (devise fonctionnelle)"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:241
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:233
+msgid "Unit Price"
+msgstr "Prix Unitaire"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:231
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:223
+msgid "Order ref"
+msgstr "Ref commande"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:192
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:184
+msgid "Address:"
+msgstr "Adresse:"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:181
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:173
+msgid "Name:"
+msgstr "Nom:"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:249
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:237
+msgid "Modification comment"
+msgstr "Commentaire de modification"
+
+#. module: sales_followup
+#: model:ir.actions.report.xml,name:sales_followup.report_ir_track_changes_xls
+msgid "Internal Request Track Changes Excel Export"
+msgstr "Export Excel du Suivi des Changements des Demandes Internes"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:176
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:168
+msgid "Instance information"
+msgstr "Informations sur l'instance"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:206
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:198
+msgid "Order Ref:"
+msgstr "Ref Commande:"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:213
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:205
+msgid "Date of the request:"
+msgstr "Date de la requête:"
+
+#. modules: sales_followup, purchase_followup
+#: code:addons/purchase_followup/wizard/po_track_changes_wizard.py:94
+#: code:addons/sales_followup/wizard/ir_track_changes_wizard.py:94
+#, python-format
+msgid "No data found with these parameters"
+msgstr "Aucune donnée n'a été trouvée avec ces paramètres"
+
+#. module: sales_followup
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:235
+msgid "Subtotal"
+msgstr "Sous-Total"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:195
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:187
+msgid "Date end:"
+msgstr "Date de fin:"
+
+#. modules: sales_followup
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:229
+#, python-format
+msgid "Qty"
+msgstr "Qté"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:178
+#: view:po.track.changes.wizard:0
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:170
+#: view:ir.track.changes.wizard:0
+msgid "Request parameters"
+msgstr "Paramètres de la requête"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:184
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:176
+msgid "Date start:"
+msgstr "Date de départ:"
+
+#. module: sales_followup
+#: model:ir.actions.act_window,name:sales_followup.action_ir_track_changes_wizard
+#: model:ir.ui.menu,name:sales_followup.menu_ir_track_changes
+msgid "IR Track Changes"
+msgstr "Suivi Changements Demandes Internes"
+
+#. modules: sales_followup, purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:232
+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:224
+#, python-format
+msgid "Status"
+msgstr "État"
+
+#. module: purchase_followup
+#: model:ir.actions.act_window,name:purchase_followup.action_po_track_changes_wizard
+#: model:ir.ui.menu,name:purchase_followup.menu_po_track_changes
+msgid "PO Track Changes"
+msgstr "Suivi Changements Bons de Commande"
+
+#. module: purchase_followup
+#: model:ir.actions.report.xml,name:purchase_followup.report_po_track_changes_xls
+msgid "Purchase Order Track Changes Excel Export"
+msgstr "Export Excel du Suivi des Changements des Bons de Commande"
+
+#. module: purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:245
+msgid "Price in functional currency"
+msgstr "Prix dans la devise fonctionnelle"
+
+#. modules: purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:242
+msgid "Currency"
+msgstr "Devise"
+
+#. module: purchase_followup
+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:247
+msgid "Subtotal (functional currency)"
+msgstr "Sous-Total (devise fonctionnelle)"
+
+#. modules: purchase, purchase_override, sale
+#: field:purchase.order.line,modification_comment:0
+#: field:purchase.order.merged.line,modification_comment:0
+#: field:sale.order.line,modification_comment:0
+msgid "Modification Comment"
+msgstr "Commentaire de Modification"
 
=== modified file 'bin/addons/procurement_request/__openerp__.py'
--- bin/addons/procurement_request/__openerp__.py	2017-09-28 14:05:02 +0000
+++ bin/addons/procurement_request/__openerp__.py	2017-10-26 10:06:24 +0000
@@ -45,6 +45,7 @@
         'procurement_request_sequence.xml',
         'procurement_request_wizard.xml',
         'procurement_request_report.xml',
+        'procurement_request_line_wizard.xml',
         'wizard/wizard_import_list_view.xml',
     ],
     'demo_xml': [
 
=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2017-10-03 16:01:45 +0000
+++ bin/addons/procurement_request/procurement_request.py	2017-10-26 10:06:24 +0000
@@ -694,15 +694,44 @@
 
         for line in self.browse(cr, uid, ids, context=context):
             changed = False
-            if line.modification_comment or (line.original_qty and line.original_price and line.original_uom):
-                if line.modification_comment or line.product_uom_qty != line.original_qty \
-                        or line.price_unit != line.original_price or line.product_uom != line.original_uom:
-                    changed = True
+            if line.modification_comment or (line.original_qty and line.product_uom_qty != line.original_qty):
+                changed = True
 
             res[line.id] = changed
 
         return res
 
+    def button_view_changed(self, cr, uid, ids, context=None):
+        """
+        Launch wizard to display line information
+        """
+        if not context:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        wiz_obj = self.pool.get('procurement.request.line.wizard')
+        cols = ['product_id', 'original_product', 'product_uom_qty', 'original_qty', 'price_unit',
+                'original_price', 'product_uom', 'original_uom', 'modification_comment']
+        sol = self.read(cr, uid, ids[0], cols, context=context)
+        wiz_id = wiz_obj.create(cr, uid, sol, context=context)
+
+        context.update({
+            'active_id': ids[0],
+            'active_ids': ids,
+        })
+
+        return {
+            'name': _('Original Data Internal Request Line'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'procurement.request.line.wizard',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'target': 'new',
+            'res_id': [wiz_id],
+            'context': context,
+        }
+
     _columns = {
         'cost_price': fields.float(string='Cost price', digits_compute=dp.get_precision('Sale Price Computation')),
         'procurement_request': fields.boolean(string='Internal Request', readonly=True),
@@ -715,6 +744,7 @@
         'product_id_ok': fields.function(_get_product_id_ok, type="boolean", method=True, string='Product defined?', help='for if true the button "configurator" is hidden'),
         'product_ok': fields.boolean('Product selected'),
         'comment_ok': fields.boolean('Comment written'),
+        'original_product': fields.many2one('product.product', 'Original Product'),
         'original_qty': fields.float('Original Qty'),
         'original_price': fields.float('Original Price'),
         'original_uom': fields.many2one('product.uom', 'Original UOM'),
 
=== added file 'bin/addons/procurement_request/procurement_request_line_wizard.xml'
--- bin/addons/procurement_request/procurement_request_line_wizard.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/procurement_request/procurement_request_line_wizard.xml	2017-10-26 10:06:24 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="procurement_request_line_wizard_form">
+            <field name="name">procurement.request.line.wizard.form"</field>
+            <field name="model">procurement.request.line.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type='xml'>
+                <form string="Original Data Internal Request Line">
+                    <field name="product_id" colspan="2"/>
+                    <field name="original_product" colspan="2"/>
+                    <field name="product_uom_qty" colspan="2"/>
+                    <field name="original_qty" colspan="2"/>
+                    <field name="price_unit" colspan="2"/>
+                    <field name="original_price" colspan="2"/>
+                    <field name="product_uom" colspan="2"/>
+                    <field name="original_uom" colspan="2"/>
+                    <field name="modification_comment" colspan="4"/>
+                    <newline/>
+                    <button icon="gtk-cancel" special="cancel" string="Close Wizard" colspan="4"/>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
 \ No newline at end of file
 
=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2017-10-16 09:46:36 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2017-10-26 10:06:24 +0000
@@ -9,6 +9,7 @@
             <field name="priority" eval="250" />
             <field name="arch" type="xml">
                 <form string="Internal Request">
+                    <field name="sourcing_trace_ok" invisible="1" />
                     <group colspan="6" attrs="{'invisible': [('state', 'not in', ['validated', 'validated_p'])]}">
                         <html>
                             <p style="text-align:center; color: red; font-weight: bold; font-size: 1.2em;">
@@ -34,6 +35,7 @@
                         <field name="fo_to_resource" invisible="1" />
                         <field name="parent_order_name" attrs="{'invisible': [('fo_to_resource', '=', False)]}" />
                     </group>
+
                     <notebook colspan="5">
                         <page string="Products">
                             <button colspan="4" string="Round Qty to SoQ" type="object" name="round_to_soq" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'draft')]}" />
@@ -66,6 +68,8 @@
                                     icon="terp-go-week" />
                                     <field name="product_uom_qty" on_change="onchange_uom(product_id, product_uom, product_uom_qty)" />
                                     <field name="original_changed" readonly="1"/>
+                                    <button name="button_view_changed" string="View Current/Original" type="object" icon="terp-stock_zoom"
+                                            attrs="{'invisible': [('original_changed', '=', False)]}"/>
                                     <field name="price_unit"/>
                                     <field name="notes" />
                                     <field name="display_resourced_orig_line" />
@@ -122,6 +126,9 @@
                         <page string="Notes">
                             <field name="notes" nolabel="1" />
                         </page>
+                        <page string="Sourcing Logs" attrs="{'invisible': [('sourcing_trace_ok', '=', False)]}">
+                            <field name="sourcing_trace" colspan="4" nolabel="1" />
+                        </page>
                     </notebook>
                 </form>
             </field>
 
=== modified file 'bin/addons/procurement_request/wizard/__init__.py'
--- bin/addons/procurement_request/wizard/__init__.py	2011-05-13 14:36:09 +0000
+++ bin/addons/procurement_request/wizard/__init__.py	2017-10-26 10:06:24 +0000
@@ -23,6 +23,7 @@
 import wizard_list_to_order
 import wizard_list_to_rfq
 import wizard_import_list
+import procurement_request_line_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== added file 'bin/addons/procurement_request/wizard/procurement_request_line_wizard.py'
--- bin/addons/procurement_request/wizard/procurement_request_line_wizard.py	1970-01-01 00:00:00 +0000
+++ bin/addons/procurement_request/wizard/procurement_request_line_wizard.py	2017-10-26 10:06:24 +0000
@@ -0,0 +1,44 @@
+# -*- 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
+
+
+class procurement_request_line_wizard(osv.osv_memory):
+    _name = 'procurement.request.line.wizard'
+    _description = 'Original Data Internal Request line'
+
+    _columns = {
+        'id': fields.integer('id'),
+        'product_id': fields.many2one('product.product', 'Current Product', readonly=True),
+        'original_product': fields.many2one('product.product', 'Original Product', readonly=True),
+        'product_uom_qty': fields.float('Current Qty', readonly=True),
+        'original_qty': fields.float('Original Qty', readonly=True),
+        'price_unit': fields.float('Current Price', readonly=True),
+        'original_price': fields.float('Original Price', readonly=True),
+        'product_uom': fields.many2one('product.uom', 'Current UOM', readonly=True),
+        'original_uom': fields.many2one('product.uom', 'Original UOM', readonly=True),
+        'modification_comment': fields.char('Modification Comment', size=1024, readonly=True),
+    }
+
+
+procurement_request_line_wizard()
 
=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2017-10-20 12:24:56 +0000
+++ bin/addons/purchase/purchase_order_line.py	2017-10-26 10:06:24 +0000
@@ -259,15 +259,8 @@
 
         for line in self.browse(cr, uid, ids, context=context):
             changed = False
-            if line.modification_comment\
-                    or (line.original_qty and line.original_price and line.original_uom and line.original_currency_id):
-                if line.modification_comment or line.product_qty != line.original_qty \
-                        or line.price_unit != line.original_price or line.product_uom != line.original_uom\
-                        or line.currency_id != line.original_currency_id:
-                    changed = True
-            elif line.original_qty and line.original_uom and not line.original_price:  # From IR
-                if line.original_qty != line.product_qty or line.original_uom.id != line.product_uom.id:
-                    changed = True
+            if line.modification_comment or (line.original_qty and line.product_qty != line.original_qty):
+                changed = True
 
             res[line.id] = changed
         return res
@@ -488,10 +481,10 @@
         # not replacing the po_state from sale_followup - should ?
         'po_state_stored': fields.related('order_id', 'state', type='selection', selection=PURCHASE_ORDER_STATE_SELECTION, string='Po State', readonly=True,),
         'po_partner_type_stored': fields.related('order_id', 'partner_type', type='selection', selection=PARTNER_TYPE, string='Po Partner Type', readonly=True,),
-
+        'original_product': fields.many2one('product.product', 'Original Product'),
         'original_qty': fields.float('Original Qty'),
         'original_price': fields.float('Original Price'),
-        'original_uom': fields.many2one('product.uom', 'Original UOM'),
+        'original_uom': fields.many2one('product.uom', 'Original UoM'),
         'original_currency_id': fields.many2one('res.currency', 'Original Currency'),
         'modification_comment': fields.char('Modification Comment', size=1024),
         'original_changed': fields.function(_check_changed, method=True, string='Changed', type='boolean'),
@@ -1058,6 +1051,8 @@
         if vals.get('linked_sol_id'):
             sol_comment = self.pool.get('sale.order.line').read(cr, uid, vals.get('linked_sol_id'), ['comment'], context=context)['comment']
             vals.update({'comment': sol_comment})
+            if not product_id and not vals.get('name'):  # US-3530
+                vals.update({'name': 'None'})
 
         # add the database Id to the sync_order_line_db_id
         po_line_id = super(purchase_order_line, self).create(cr, uid, vals, context=context)
@@ -1127,9 +1122,9 @@
 
         default.update({'state': 'draft', 'move_ids': [], 'invoiced': 0, 'invoice_lines': [], 'commitment_line_ids': []})
 
-        for field in ['origin', 'move_dest_id', 'original_qty', 'original_price', 'original_uom', 'original_currency_id', 'modification_comment', 'sync_linked_sol']:
+        for field in ['origin', 'move_dest_id', 'original_product', 'original_qty', 'original_price', 'original_uom', 'original_currency_id', 'modification_comment', 'sync_linked_sol']:
             if field not in default:
-                default[field]= False
+                default[field] = False
 
         default.update({'sync_order_line_db_id': False, 'set_as_sourced_n': False, 'set_as_validated_n': False, 'linked_sol_id': False, 'link_so_id': False})
 
 
=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2017-10-18 07:20:45 +0000
+++ bin/addons/purchase/purchase_workflow.py	2017-10-26 10:06:24 +0000
@@ -333,6 +333,10 @@
                 'original_price': pol.price_unit,
                 'original_currency_id': pol.currency_id.id
             }
+
+            if not pol.original_product:
+                line_update['original_product'] = pol.product_id.id
+
             if not pol.original_qty:
                 line_update['original_qty'] = pol.product_qty
 
 
=== modified file 'bin/addons/purchase_followup/__init__.py'
--- bin/addons/purchase_followup/__init__.py	2017-09-28 12:19:50 +0000
+++ bin/addons/purchase_followup/__init__.py	2017-10-26 10:06:24 +0000
@@ -21,5 +21,6 @@
 
 import purchase_followup
 import report
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/purchase_followup/__openerp__.py'
--- bin/addons/purchase_followup/__openerp__.py	2017-10-09 21:06:10 +0000
+++ bin/addons/purchase_followup/__openerp__.py	2017-10-26 10:06:24 +0000
@@ -35,7 +35,9 @@
     'init_xml' : [ ],
     "update_xml": [
         "purchase_followup_view.xml",
-        "report/purchase_follow_up_report.xml"
+        "report/purchase_follow_up_report.xml",
+        "report/po_track_changes_report.xml",
+        "wizard/po_track_changes_wizard_view.xml",
     ],
     'demo_xml' : [ ],
     'test': [
 
=== modified file 'bin/addons/purchase_followup/report/__init__.py'
--- bin/addons/purchase_followup/report/__init__.py	2014-05-07 14:04:54 +0000
+++ bin/addons/purchase_followup/report/__init__.py	2017-10-26 10:06:24 +0000
@@ -1,1 +1,2 @@
 import purchase_follow_up_report
+import po_track_changes_report
 
=== added file 'bin/addons/purchase_followup/report/po_track_changes_report.py'
--- bin/addons/purchase_followup/report/po_track_changes_report.py	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase_followup/report/po_track_changes_report.py	2017-10-26 10:06:24 +0000
@@ -0,0 +1,92 @@
+# -*- 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 po_track_changes_report_parser(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(po_track_changes_report_parser, self).__init__(cr, uid, name, context=context)
+        self.cr = cr
+        self.uid = uid
+        self.user_company = self._get_user_company()
+        self.localcontext.update({
+            'time': time,
+            'getLines': self._get_po_lines,
+            'userCompany': self.user_company,
+            'computeCurrency': self._compute_currency
+        })
+
+    def _get_po_lines(self, report):
+        '''
+        Return the lines for the report
+        '''
+        result = []
+        for line in report.po_line_ids:
+            result.append(self.pool.get('purchase.order.line').browse(self.cr, self.uid, line))
+
+        return sorted(result, key=lambda r: (r['order_id']['name']), reverse=True)
+
+    def _get_user_company(self):
+        '''
+        Return user's current company
+        '''
+        return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id
+
+    def _compute_currency(self, pol, original=False):
+        '''
+        Compute an amount of a given currency to the instance's currency
+        '''
+        currency_obj = self.pool.get('res.currency')
+
+        from_currency_id = pol.currency_id.id
+        if original and pol.original_currency_id:
+            from_currency_id = pol.original_currency_id.id
+
+        context = {'date': pol.date_planned}
+        to_currency_id = self.user_company['currency_id'].id
+
+        if from_currency_id == to_currency_id:
+            return round(pol.price_unit, 2)
+
+        return round(currency_obj.compute(self.cr, self.uid, from_currency_id, to_currency_id, pol.price_unit, round=False, context=context), 2)
+
+
+class po_track_changes_report_xls(SpreadsheetReport):
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse,
+                 header='external', store=False):
+        super(po_track_changes_report_xls, self).__init__(name, table,
+                                                          rml=rml, parser=parser, header=header, store=store)
+
+    def create(self, cr, uid, ids, data, context=None):
+        a = super(po_track_changes_report_xls, self).create(cr, uid, ids,
+                                                            data, context)
+        return (a[0], 'xls')
+
+po_track_changes_report_xls(
+    'report.po.track.changes.report_xls',
+    'po.track.changes.wizard',
+    'addons/purchase_followup/report/po_track_changes_report_xls.mako',
+    parser=po_track_changes_report_parser,
+    header=False)
 
=== added file 'bin/addons/purchase_followup/report/po_track_changes_report.xml'
--- bin/addons/purchase_followup/report/po_track_changes_report.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase_followup/report/po_track_changes_report.xml	2017-10-26 10:06:24 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <report
+            id="report_po_track_changes_xls"
+            name="po.track.changes.report_xls"
+            model="po.track.changes.wizard"
+            string="Purchase Order Track Changes Excel Export"
+            file="purchase_followup/report/po_track_changes_report_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+        />
+
+    </data>
+</openerp>
 
=== added file 'bin/addons/purchase_followup/report/po_track_changes_report_xls.mako'
--- bin/addons/purchase_followup/report/po_track_changes_report_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase_followup/report/po_track_changes_report_xls.mako	2017-10-26 10:06:24 +0000
@@ -0,0 +1,299 @@
+<?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>
+    <Style ss:ID="ssCellBlue">
+        <Alignment ss:Vertical="Top" ss:WrapText="1"/>
+        <Font ss:Color="#0000FF" />
+    </Style>
+
+    <!-- File header -->
+    <Style ss:ID="big_header">
+        <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
+    </Style>
+    <Style ss:ID="file_header">
+        <Font ss:Size="9" />
+        <Interior ss:Color="#C0C0C0" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Line header -->
+    <Style ss:ID="line_header">
+        <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>
+        <Font x:Family="Swiss" ss:Size="8" ss:Bold="1"/>
+        <Interior/>
+    </Style>
+    <Style ss:ID="line_header_orange">
+        <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>
+        <Font x:Family="Swiss" ss:Size="8" ss:Bold="1"/>
+        <Interior ss:Color="#F79646" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Lines -->
+    <Style ss:ID="line_left">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="line_right">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+     <Style ss:ID="line_center">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="line_center_no_digits">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="line_left_date">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="Short Date" />
+        <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="short_date">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+        <NumberFormat ss:Format="Short Date" />
+        <Font ss:Color="#0000FF" />
+    </Style>
+</Styles>
+
+
+% for r in objects:
+<ss:Worksheet ss:Name="IR Follow Up per Location">
+    <Table x:FullColumns="1" x:FullRows="1">
+        ## Order ref
+        <Column ss:AutoFitWidth="1" ss:Width="145.75" />
+        ## Status
+        <Column ss:AutoFitWidth="1" ss:Width="160.75" />
+        ## Item
+        <Column ss:AutoFitWidth="1" ss:Width="30.0" />
+        ## Product code
+        <Column ss:AutoFitWidth="1" ss:Width="70.25" />
+        ## Product description
+        <Column ss:AutoFitWidth="1" ss:Width="250.25" />
+        ## Original Product code
+        <Column ss:AutoFitWidth="1" ss:Width="70.25" />
+        ## Qty
+        <Column ss:AutoFitWidth="1" ss:Width="58.75" />
+        ## UoM
+        <Column ss:AutoFitWidth="1" ss:Width="58.75" />
+        ## Original Qty
+        <Column ss:AutoFitWidth="1" ss:Width="63.75" />
+        ## Original UoM
+        <Column ss:AutoFitWidth="1" ss:Width="63.75" />
+        ## Price
+        <Column ss:AutoFitWidth="1" ss:Width="75.75" />
+        ## Currency
+        <Column ss:AutoFitWidth="1" ss:Width="58.75" />
+        ## Original Price
+        <Column ss:AutoFitWidth="1" ss:Width="85.75" />
+        ## Original Currency
+        <Column ss:AutoFitWidth="1" ss:Width="90.75" />
+        ## Price in functional currency
+        <Column ss:AutoFitWidth="1" ss:Width="130.75" />
+        ## Original Price in functional currency
+        <Column ss:AutoFitWidth="1" ss:Width="160.75" />
+        ## Subtotal (functional currency)
+        <Column ss:AutoFitWidth="1" ss:Width="140.25" />
+        ## Original Subtotal (functional currency)
+        <Column ss:AutoFitWidth="1" ss:Width="170.25" />
+        ## Modification comment
+        <Column ss:AutoFitWidth="1" ss:Width="209.25" />
+
+        <Row ss:Height="18">
+            <Cell ss:StyleID="big_header"><Data ss:Type="String">INTERNAL REQUEST Track Changes report</Data><NamedCell ss:Name="Print_Area"/></Cell>
+        </Row>
+
+        <Row ss:Height="10"></Row>
+
+        ## WORKSHEET HEADER
+        <Row>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="1"><Data ss:Type="String">${_('Instance information')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="4"><Data ss:Type="String">${_('Request parameters')|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Name:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.instance_id.instance or '-'|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Date start:')|x}</Data></Cell>
+            % if isDate(r.start_date):
+            <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${r.start_date|n}T00:00:00.000</Data></Cell>
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Address:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.name or '-'|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Date end:')|x}</Data></Cell>
+            % if isDate(r.end_date):
+            <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${r.end_date|n}T00:00:00.000</Data></Cell>
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.address[0].street or ''|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Order Ref:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue" ss:MergeAcross="2"><Data ss:Type="String">${r.po_id.id and r.po_id.name or '-'|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.address[0].zip|x} ${r.company_id.partner_id.address[0].city|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Date of the request:')|x}</Data></Cell>
+            % if r.report_date and isDateTime(r.report_date):
+            <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${r.report_date[0:10]|n}T${r.report_date[11:19]|n}.000</Data></Cell>
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.address[0].country_id and r.company_id.partner_id.address[0].country_id.name or ''|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+        </Row>
+
+        <Row></Row>
+
+        <Row>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Order ref')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Status')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Item')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Code')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Description')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Original Code')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Qty')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('UoM')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Qty')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Original UoM')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Unit Price')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Currency')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Unit Price')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Currency')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Price in functional currency')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Price in functional currency')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Subtotal (functional currency)')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Subtotal (functional currency)')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Modification comment')|x}</Data></Cell>
+        </Row>
+
+        % for line in getLines(r):
+            <Row ss:Height="11.25">
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.order_id.name|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.state|x}</Data></Cell>
+                <Cell ss:StyleID="line_center_no_digits"><Data ss:Type="Number">${line.line_number|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.product_id.default_code or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.name|x}</Data></Cell>
+                % if line.original_product and line.product_id.default_code != line.original_product.default_code:
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.original_product.default_code or ''|x}</Data></Cell>
+                % else:
+                <Cell ss:StyleID="line_left"><Data ss:Type="String"></Data></Cell>
+                % endif
+                <Cell ss:StyleID="line_left"><Data ss:Type="Number">${line.product_qty|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.product_uom.name|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="Number">${line.original_qty or 0|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.original_uom.name or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${line.price_unit|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${line.currency_id.name|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${line.original_price or 0|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${line.original_currency_id and line.original_currency_id.name or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${computeCurrency(line, False)|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${computeCurrency(line, True)|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${computeCurrency(line, False) * line.product_qty|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${computeCurrency(line, True) * line.original_qty|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.modification_comment or ''|x}</Data></Cell>
+            </Row>
+        % endfor
+
+    </Table>
+
+    <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+        <PageSetup>
+            <Layout x:Orientation="Landscape"/>
+            <Footer x:Data="Page &amp;P of &amp;N"/>
+        </PageSetup>
+        <Selected/>
+        <Panes>
+            <Pane>
+                <Number>3</Number>
+                <ActiveRow>21</ActiveRow>
+            </Pane>
+        </Panes>
+        <ProtectObjects>False</ProtectObjects>
+        <ProtectScenarios>False</ProtectScenarios>
+    </WorksheetOptions>
+</ss:Worksheet>
+% endfor
+</Workbook>
 
=== added directory 'bin/addons/purchase_followup/wizard'
=== added file 'bin/addons/purchase_followup/wizard/__init__.py'
--- bin/addons/purchase_followup/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase_followup/wizard/__init__.py	2017-10-26 10:06:24 +0000
@@ -0,0 +1,22 @@
+# -*- 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/>.
+# 
+##############################################################################
+
+import po_track_changes_wizard
 
=== added file 'bin/addons/purchase_followup/wizard/po_track_changes_wizard.py'
--- bin/addons/purchase_followup/wizard/po_track_changes_wizard.py	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase_followup/wizard/po_track_changes_wizard.py	2017-10-26 10:06:24 +0000
@@ -0,0 +1,130 @@
+# -*- 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 _
+
+import time
+
+
+class po_track_changes_wizard(osv.osv_memory):
+    _name = 'po.track.changes.wizard'
+    _rec_name = 'report_date'
+    _order = 'report_date desc'
+
+    _columns = {
+        'report_date': fields.datetime(
+            string='Date of the demand',
+            readonly=True,
+        ),
+        'company_id': fields.many2one(
+            'res.company',
+            string='Company',
+            readonly=True,
+        ),
+        'start_date': fields.date(
+            string='Start date',
+        ),
+        'end_date': fields.date(
+            string='End date',
+        ),
+        'po_line_ids': fields.text(
+            string='Purchase Orders Lines',
+            readonly=True
+        ),
+        'po_id': fields.many2one(
+            'purchase.order',
+            string='Purchase Order Ref.',
+        ),
+    }
+
+    _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
+        '''
+        po_line_obj = self.pool.get('purchase.order.line')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for wizard in self.browse(cr, uid, ids, context=context):
+            po_domain = []
+
+            if wizard.start_date:
+                po_domain.append(('create_date', '>=', wizard.start_date))
+
+            if wizard.end_date:
+                po_domain.append(('create_date', '<=', wizard.end_date))
+
+            if wizard.po_id:
+                po_domain.append(('order_id', '=', wizard.po_id.id))
+
+            po_line_ids = po_line_obj.search(cr, uid, po_domain, context=context)
+
+            if not po_line_ids:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('No data found with these parameters'),
+                )
+
+            self.write(cr, uid, [wizard.id], {'po_line_ids': po_line_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': 'PURCHASE ORDER Track Changes report',
+            'report_name': 'po.track.changes.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': 'po.track.changes.report_xls',
+            'datas': data,
+            'context': context,
+        }
+
+
+po_track_changes_wizard()
 
=== added file 'bin/addons/purchase_followup/wizard/po_track_changes_wizard_view.xml'
--- bin/addons/purchase_followup/wizard/po_track_changes_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase_followup/wizard/po_track_changes_wizard_view.xml	2017-10-26 10:06:24 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <data>
+
+        <record id="po_track_changes_wizard_form_view" model="ir.ui.view">
+            <field name="name">po.track.changes.wizard.form.view</field>
+            <field name="model">po.track.changes.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="PURCHASE ORDER Track Changes">
+                    <separator colspan="4" string="Request parameters" />
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="po_id" />
+                    <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_po_track_changes_wizard" model="ir.actions.act_window">
+            <field name="name">PO Track Changes</field>
+            <field name="res_model">po.track.changes.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_po_track_changes"
+            action="action_po_track_changes_wizard"
+            parent="purchase.menu_procurement_management"
+            sequence="2"
+            />
+
+    </data>
+
+</openerp>
 
=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2017-10-19 07:42:45 +0000
+++ bin/addons/sale/sale_order.py	2017-10-26 10:06:24 +0000
@@ -2104,7 +2104,7 @@
             'set_as_sourced_n': False,
         })
 
-        for x in ['modification_comment', 'original_qty', 'original_price', 'original_uom', 'sync_linked_pol', 'resourced_original_line']:
+        for x in ['modification_comment', 'original_product', 'original_qty', 'original_price', 'original_uom', 'sync_linked_pol', 'resourced_original_line']:
             if x not in default:
                 default[x] = False
 
 
=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2017-10-13 14:36:52 +0000
+++ bin/addons/sale/sale_workflow.py	2017-10-26 10:06:24 +0000
@@ -345,6 +345,7 @@
                     to_write['type'] = 'make_to_stock'
 
             elif sol.procurement_request:  # in case of IR
+                to_write['original_product'] = sol.product_id.id
                 to_write['original_qty'] = sol.product_uom_qty
                 to_write['original_price'] = sol.price_unit
                 to_write['original_uom'] = sol.product_uom.id
 
=== modified file 'bin/addons/sales_followup/__openerp__.py'
--- bin/addons/sales_followup/__openerp__.py	2017-09-28 14:05:02 +0000
+++ bin/addons/sales_followup/__openerp__.py	2017-10-26 10:06:24 +0000
@@ -44,8 +44,10 @@
         "sale_followup_view.xml",
         "report/sale_follow_up_report.xml",
         "report/ir_follow_up_location_report.xml",
+        "report/ir_track_changes_report.xml",
         "wizard/sale_followup_multi_wizard_view.xml",
         "wizard/ir_followup_location_wizard_view.xml",
+        "wizard/ir_track_changes_wizard_view.xml",
     ],
     "demo_xml": [
     ],
 
=== modified file 'bin/addons/sales_followup/report/__init__.py'
--- bin/addons/sales_followup/report/__init__.py	2017-08-18 14:31:17 +0000
+++ bin/addons/sales_followup/report/__init__.py	2017-10-26 10:06:24 +0000
@@ -22,3 +22,4 @@
 import sale_follow_up_report
 import sale_follow_up_report_multi
 import ir_follow_up_location_report
+import ir_track_changes_report
 
=== added file 'bin/addons/sales_followup/report/ir_track_changes_report.py'
--- bin/addons/sales_followup/report/ir_track_changes_report.py	1970-01-01 00:00:00 +0000
+++ bin/addons/sales_followup/report/ir_track_changes_report.py	2017-10-26 10:06:24 +0000
@@ -0,0 +1,73 @@
+# -*- 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 ir_track_changes_report_parser(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(ir_track_changes_report_parser, self).__init__(cr, uid, name, context=context)
+        self.cr = cr
+        self.uid = uid
+        self.user_company = self._get_user_company()
+        self.localcontext.update({
+            'time': time,
+            'getLines': self._get_ir_lines,
+            'userCompany': self.user_company,
+        })
+
+    def _get_ir_lines(self, report):
+        '''
+        Return the lines for the report
+        '''
+        result = []
+        for line in report.order_line_ids:
+            result.append(self.pool.get('sale.order.line').browse(self.cr, self.uid, line))
+
+        return sorted(result, key=lambda r: (r['order_id']['name']), reverse=True)
+
+    def _get_user_company(self):
+        '''
+        Return user's current company
+        '''
+        return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id
+
+
+class ir_track_changes_report_xls(SpreadsheetReport):
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse,
+                 header='external', store=False):
+        super(ir_track_changes_report_xls, self).__init__(name, table,
+                                                          rml=rml, parser=parser, header=header, store=store)
+
+    def create(self, cr, uid, ids, data, context=None):
+        a = super(ir_track_changes_report_xls, self).create(cr, uid, ids,
+                                                            data, context)
+        return (a[0], 'xls')
+
+ir_track_changes_report_xls(
+    'report.ir.track.changes.report_xls',
+    'ir.track.changes.wizard',
+    'addons/sales_followup/report/ir_track_changes_report_xls.mako',
+    parser=ir_track_changes_report_parser,
+    header=False)
 
=== added file 'bin/addons/sales_followup/report/ir_track_changes_report.xml'
--- bin/addons/sales_followup/report/ir_track_changes_report.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/sales_followup/report/ir_track_changes_report.xml	2017-10-26 10:06:24 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <report
+            id="report_ir_track_changes_xls"
+            name="ir.track.changes.report_xls"
+            model="ir.track.changes.wizard"
+            string="Internal Request Track Changes Excel Export"
+            file="sales_followup/report/ir_track_changes_report_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+        />
+
+    </data>
+</openerp>
 
=== added file 'bin/addons/sales_followup/report/ir_track_changes_report_xls.mako'
--- bin/addons/sales_followup/report/ir_track_changes_report_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/sales_followup/report/ir_track_changes_report_xls.mako	2017-10-26 10:06:24 +0000
@@ -0,0 +1,283 @@
+<?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>
+    <Style ss:ID="ssCellBlue">
+        <Alignment ss:Vertical="Top" ss:WrapText="1"/>
+        <Font ss:Color="#0000FF" />
+    </Style>
+
+    <!-- File header -->
+    <Style ss:ID="big_header">
+        <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
+    </Style>
+    <Style ss:ID="file_header">
+        <Font ss:Size="9" />
+        <Interior ss:Color="#C0C0C0" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Line header -->
+    <Style ss:ID="line_header">
+        <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>
+        <Font x:Family="Swiss" ss:Size="8" ss:Bold="1"/>
+        <Interior/>
+    </Style>
+    <Style ss:ID="line_header_orange">
+        <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>
+        <Font x:Family="Swiss" ss:Size="8" ss:Bold="1"/>
+        <Interior ss:Color="#F79646" ss:Pattern="Solid"/>
+    </Style>
+
+    <!-- Lines -->
+    <Style ss:ID="line_left">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+        <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="line_right">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+     <Style ss:ID="line_center">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+        <NumberFormat ss:Format="#,##0.00"/>
+    </Style>
+    <Style ss:ID="line_center_no_digits">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+         <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="line_left_date">
+        <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+        <NumberFormat ss:Format="Short Date" />
+        <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>
+        <Font ss:Size="8" ss:Color="#0000FF"/>
+    </Style>
+    <Style ss:ID="short_date">
+        <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
+        <NumberFormat ss:Format="Short Date" />
+        <Font ss:Color="#0000FF" />
+    </Style>
+</Styles>
+
+
+% for r in objects:
+<ss:Worksheet ss:Name="IR Follow Up per Location">
+    <Table x:FullColumns="1" x:FullRows="1">
+        ## Order ref
+        <Column ss:AutoFitWidth="1" ss:Width="80.0" />
+        ## Status
+        <Column ss:AutoFitWidth="1" ss:Width="160.75" />
+        ## Item
+        <Column ss:AutoFitWidth="1" ss:Width="30.0" />
+        ## Product code
+        <Column ss:AutoFitWidth="1" ss:Width="70.25" />
+        ## Product description
+        <Column ss:AutoFitWidth="1" ss:Width="250.25" />
+        ## Original Product code
+        <Column ss:AutoFitWidth="1" ss:Width="70.25" />
+        ## Qty
+        <Column ss:AutoFitWidth="1" ss:Width="58.75" />
+        ## UoM
+        <Column ss:AutoFitWidth="1" ss:Width="58.75" />
+        ## Original Qty
+        <Column ss:AutoFitWidth="1" ss:Width="63.75" />
+        ## Original UoM
+        <Column ss:AutoFitWidth="1" ss:Width="63.75" />
+        ## Price
+        <Column ss:AutoFitWidth="1" ss:Width="75.75" />
+        ## Original Price
+        <Column ss:AutoFitWidth="1" ss:Width="85.75" />
+        ## Subtotal
+        <Column ss:AutoFitWidth="1" ss:Width="85.75" />
+        ## Original Subtotal
+        <Column ss:AutoFitWidth="1" ss:Width="75.25" />
+        ## Modification comment
+        <Column ss:AutoFitWidth="1" ss:Width="209.25"  />
+
+        <Row ss:Height="18">
+            <Cell ss:StyleID="big_header"><Data ss:Type="String">INTERNAL REQUEST Track Changes report</Data><NamedCell ss:Name="Print_Area"/></Cell>
+        </Row>
+
+        <Row ss:Height="10"></Row>
+
+        ## WORKSHEET HEADER
+        <Row>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="1"><Data ss:Type="String">${_('Instance information')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="file_header" ss:MergeAcross="4"><Data ss:Type="String">${_('Request parameters')|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Name:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.instance_id.instance or '-'|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Date start:')|x}</Data></Cell>
+            % if isDate(r.start_date):
+            <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${r.start_date|n}T00:00:00.000</Data></Cell>
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String">${_('Address:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.name or '-'|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Date end:')|x}</Data></Cell>
+            % if isDate(r.end_date):
+            <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${r.end_date|n}T00:00:00.000</Data></Cell>
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.address[0].street or ''|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Order Ref:')|x}</Data></Cell>
+            <Cell ss:StyleID="ssCellBlue" ss:MergeAcross="2"><Data ss:Type="String">${r.order_id.id and r.order_id.name or '-'|x}</Data></Cell>
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.address[0].zip|x} ${r.company_id.partner_id.address[0].city|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String">${_('Date of the request:')|x}</Data></Cell>
+            % if r.report_date and isDateTime(r.report_date):
+            <Cell ss:StyleID="short_date" ss:MergeAcross="2"><Data ss:Type="DateTime">${r.report_date[0:10]|n}T${r.report_date[11:19]|n}.000</Data></Cell>
+            % else:
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+            % endif
+        </Row>
+        <Row>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCellBlue"><Data ss:Type="String">${r.company_id.partner_id.address[0].country_id and r.company_id.partner_id.address[0].country_id.name or ''|x}</Data></Cell>
+            <Cell ss:StyleID="ssCell"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="1"><Data ss:Type="String"></Data></Cell>
+            <Cell ss:StyleID="ssCell" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
+        </Row>
+
+        <Row></Row>
+
+        <Row>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Order ref')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Status')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Item')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Code')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Description')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Original Code')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Qty')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('UoM')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Qty')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Original UoM')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Unit Price')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Unit Price')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Subtotal')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header_orange"><Data ss:Type="String">${_('Original Subtotal')|x}</Data></Cell>
+            <Cell ss:StyleID="line_header"><Data ss:Type="String">${_('Modification comment')|x}</Data></Cell>
+        </Row>
+
+        % for line in getLines(r):
+            <Row ss:Height="11.25">
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.order_id.name|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.state|x}</Data></Cell>
+                <Cell ss:StyleID="line_center_no_digits"><Data ss:Type="Number">${line.line_number|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.product_id.default_code or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.name|x}</Data></Cell>
+                % if line.original_product and line.product_id.default_code != line.original_product.default_code:
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.original_product.default_code or ''|x}</Data></Cell>
+                % else:
+                <Cell ss:StyleID="line_left"><Data ss:Type="String"></Data></Cell>
+                % endif
+                <Cell ss:StyleID="line_left"><Data ss:Type="Number">${line.product_uom_qty|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.product_uom.name|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="Number">${line.original_qty or 0|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.original_uom.name or ''|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${line.price_unit|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${line.original_price or 0|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${line.price_unit * line.product_uom_qty|x}</Data></Cell>
+                <Cell ss:StyleID="line_center"><Data ss:Type="Number">${line.original_price * line.original_qty|x}</Data></Cell>
+                <Cell ss:StyleID="line_left"><Data ss:Type="String">${line.modification_comment or ''|x}</Data></Cell>
+            </Row>
+        % endfor
+
+    </Table>
+
+    <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+        <PageSetup>
+            <Layout x:Orientation="Landscape"/>
+            <Footer x:Data="Page &amp;P of &amp;N"/>
+        </PageSetup>
+        <Selected/>
+        <Panes>
+            <Pane>
+                <Number>3</Number>
+                <ActiveRow>17</ActiveRow>
+            </Pane>
+        </Panes>
+        <ProtectObjects>False</ProtectObjects>
+        <ProtectScenarios>False</ProtectScenarios>
+    </WorksheetOptions>
+</ss:Worksheet>
+% endfor
+</Workbook>
 
=== modified file 'bin/addons/sales_followup/wizard/__init__.py'
--- bin/addons/sales_followup/wizard/__init__.py	2017-08-18 14:31:17 +0000
+++ bin/addons/sales_followup/wizard/__init__.py	2017-10-26 10:06:24 +0000
@@ -21,3 +21,4 @@
 
 import sale_followup_multi_wizard
 import ir_followup_location_wizard
+import ir_track_changes_wizard
 
=== added file 'bin/addons/sales_followup/wizard/ir_track_changes_wizard.py'
--- bin/addons/sales_followup/wizard/ir_track_changes_wizard.py	1970-01-01 00:00:00 +0000
+++ bin/addons/sales_followup/wizard/ir_track_changes_wizard.py	2017-10-26 10:06:24 +0000
@@ -0,0 +1,130 @@
+# -*- 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 _
+
+import time
+
+
+class ir_track_changes_wizard(osv.osv_memory):
+    _name = 'ir.track.changes.wizard'
+    _rec_name = 'report_date'
+    _order = 'report_date desc'
+
+    _columns = {
+        'report_date': fields.datetime(
+            string='Date of the demand',
+            readonly=True,
+        ),
+        'company_id': fields.many2one(
+            'res.company',
+            string='Company',
+            readonly=True,
+        ),
+        'start_date': fields.date(
+            string='Start date',
+        ),
+        'end_date': fields.date(
+            string='End date',
+        ),
+        'order_line_ids': fields.text(
+            string='Orders Lines',
+            readonly=True
+        ),
+        'order_id': fields.many2one(
+            'sale.order',
+            string='Order Ref.',
+        ),
+    }
+
+    _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
+        '''
+        ir_line_obj = self.pool.get('sale.order.line')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for wizard in self.browse(cr, uid, ids, context=context):
+            ir_domain = [('procurement_request', '=', 't')]
+
+            if wizard.start_date:
+                ir_domain.append(('create_date', '>=', wizard.start_date))
+
+            if wizard.end_date:
+                ir_domain.append(('create_date', '<=', wizard.end_date))
+
+            if wizard.order_id:
+                ir_domain.append(('order_id', '=', wizard.order_id.id))
+
+            ir_line_ids = ir_line_obj.search(cr, uid, ir_domain, context=context)
+
+            if not ir_line_ids:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('No data found with these parameters'),
+                )
+
+            self.write(cr, uid, [wizard.id], {'order_line_ids': ir_line_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': 'INTERNAL REQUEST Track Changes report',
+            'report_name': 'ir.track.changes.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': 'ir.track.changes.report_xls',
+            'datas': data,
+            'context': context,
+        }
+
+
+ir_track_changes_wizard()
 
=== added file 'bin/addons/sales_followup/wizard/ir_track_changes_wizard_view.xml'
--- bin/addons/sales_followup/wizard/ir_track_changes_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/sales_followup/wizard/ir_track_changes_wizard_view.xml	2017-10-26 10:06:24 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <data>
+
+        <record id="ir_track_changes_wizard_form_view" model="ir.ui.view">
+            <field name="name">ir.track.changes.wizard.form.view</field>
+            <field name="model">ir.track.changes.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="INTERNAL REQUEST Track Changes">
+                    <separator colspan="4" string="Request parameters" />
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="order_id" domain="[('procurement_request', '=', 't')]" />
+                    <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_ir_track_changes_wizard" model="ir.actions.act_window">
+            <field name="name">IR Track Changes</field>
+            <field name="res_model">ir.track.changes.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_ir_track_changes"
+            action="action_ir_track_changes_wizard"
+            parent="base.menu_sales"
+            sequence="3"
+            />
+
+    </data>
+
+</openerp>
 
=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2017-10-02 14:14:09 +0000
+++ bin/addons/sourcing/procurement_order.py	2017-10-26 10:06:24 +0000
@@ -114,6 +114,8 @@
                 line.update({'origin': origin_line.order_id.name})
                 if origin_line.stock_take_date:
                     line.update({'stock_take_date': origin_line.stock_take_date})
+                if origin_line.original_product:
+                    line.update({'original_product': origin_line.original_product.id})
                 if origin_line.original_qty:
                     line.update({'original_qty': origin_line.original_qty})
                 if origin_line.original_uom:
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2017-10-19 14:06:34 +0000
+++ bin/addons/sourcing/sale_order_line.py	2017-10-26 10:06:24 +0000
@@ -1700,6 +1700,7 @@
                         pol_values['name'] = sourcing_line.comment
                     if sourcing_line.procurement_request:
                         pol_values.update({
+                            'original_product': sourcing_line.original_product.id,
                             'original_qty': sourcing_line.original_qty,
                             'original_uom': sourcing_line.original_uom.id,
                         })
@@ -1734,6 +1735,7 @@
                     }
                     if sourcing_line.procurement_request:
                         rfq_line_values.update({
+                            'original_product': sourcing_line.original_product.id,
                             'original_qty': sourcing_line.original_qty,
                             'original_uom': sourcing_line.original_uom.id,
                         })
@@ -1762,6 +1764,7 @@
                     }
                     if sourcing_line.procurement_request:
                         tender_values.update({
+                            'original_product': sourcing_line.original_product.id,
                             'original_qty': sourcing_line.original_qty,
                             'original_uom': sourcing_line.original_uom.id,
                         })
 
=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml	2017-10-04 06:36:54 +0000
+++ bin/addons/sourcing/sourcing_view.xml	2017-10-26 10:06:24 +0000
@@ -3,27 +3,6 @@
 	<data>
 
 
-        <record id="view_internal_request_form" model="ir.ui.view">
-            <field name="name">view.internal.request.form</field>
-            <field name="model">sale.order</field>
-            <field name="type">form</field>
-            <field name="priority" eval="500" />
-            <field name="inherit_id" ref="procurement_request.procurement_request_form_view" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form" position="inside">
-                        <field name="sourcing_trace_ok" invisible="1" />
-                    </xpath>
-
-                    <xpath expr="/form//notebook" position="inside">
-                        <page string="Sourcing Logs" attrs="{'invisible': [('sourcing_trace_ok', '=', False)]}">
-                            <field name="sourcing_trace" colspan="4" nolabel="1" />
-                        </page>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
 		<record id="sourcing_line_normal_form_view" model="ir.ui.view">
 			<field name="name">sale.order.line.sourcing.form</field>
 			<field name="model">sale.order.line</field>