Merge lp:~unifield-team/unifield-server/us-3478 into lp:~jfb-tempo-consulting/unifield-server/partial

[jftempo]

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2017-09-14 08:41:12 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2017-10-03 16:52:18 +0000
@@ -6,7 +6,7 @@
 msf_sync_data_server.fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&','&','&',('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,Valid
 msf_sync_data_server.update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&',('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,Valid
 msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'cancel'])]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,Valid
-msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok']","[('order_id.partner_type', '!=', 'external'), ('state', '!=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,Valid
+msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment']","[('order_id.partner_type', '!=', 'external'), ('state', '!=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,Valid
 msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment']","['&','&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False), ('claim', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
 msf_sync_data_server.moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
 msf_sync_data_server.dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'sync_local_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id', 'comment']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
 
=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2017-09-14 08:41:12 +0000
+++ bin/addons/procurement_request/procurement_request.py	2017-10-03 16:52:18 +0000
@@ -684,6 +684,25 @@
                 res[pol['id']] = False
         return res
 
+    def _check_changed(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Check if an original value has been changed
+        '''
+        if context is None:
+            context = {}
+        res = {}
+
+        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
+
+            res[line.id] = changed
+
+        return res
+
     _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),
@@ -696,6 +715,10 @@
         '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_qty': fields.float('Original Qty'),
+        'original_price': fields.float('Original Price'),
+        'original_uom': fields.many2one('product.uom', 'Original UOM'),
+        'original_changed': fields.function(_check_changed, method=True, string='Changed', type='boolean'),
     }
 
     def _get_planned_date(self, cr, uid, c=None):
 
=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2017-10-02 12:27:20 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2017-10-03 16:52:18 +0000
@@ -90,6 +90,7 @@
                                     attrs="{'invisible': ['|', ('product_id_ok', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}"
                                     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"/>
                                     <field name="price_unit"/>
                                     <field name="notes" />
                                     <field name="display_resourced_orig_line" />
 
=== modified file 'bin/addons/purchase/purchase_line.py'
--- bin/addons/purchase/purchase_line.py	2017-10-02 07:09:09 +0000
+++ bin/addons/purchase/purchase_line.py	2017-10-03 16:52:18 +0000
@@ -203,6 +203,29 @@
 
         return res
 
+    def _check_changed(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Check if an original value has been changed
+        '''
+        if context is None:
+            context = {}
+        res = {}
+
+        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
+
+            res[line.id] = changed
+
+        return res
 
     _columns = {
         'set_as_sourced_n': fields.boolean(string='Set as Sourced-n', help='Line has been created further and has to be created back in preceding documents'),
@@ -288,6 +311,12 @@
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner", store=True),
         'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date"),
         'stock_take_date': fields.date(string='Date of Stock Take', required=False),
+        'original_qty': fields.float('Original Qty'),
+        'original_price': fields.float('Original Price'),
+        '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'),
     }
     _defaults = {
         'set_as_sourced_n': lambda *a: False,
@@ -896,11 +925,10 @@
             default = {}
 
         default.update({'state': 'draft', 'move_ids': [], 'invoiced': 0, 'invoice_lines': []})
-        if 'origin' not in default:
-            default.update({'origin': False})
 
-        if 'move_dest_id' not in default:
-            default.update({'move_dest_id': False})
+        for field in ['origin', 'move_dest_id', 'original_qty', 'original_price', 'original_uom', 'original_currency_id', 'modification_comment']:
+            if field not in default:
+                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})
         return super(purchase_order_line, self).copy_data(cr, uid, p_id, default=default, context=context)
 
=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2017-10-02 12:27:20 +0000
+++ bin/addons/purchase/purchase_view.xml	2017-10-03 16:52:18 +0000
@@ -205,6 +205,7 @@
                                     <field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_qty"/>
+                                    <field name="original_changed" readonly="1"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
                                     <field name="price_subtotal"/>
@@ -539,8 +540,17 @@
                                 <label string=" " />
                                 <field name="account_4_distribution" invisible="1"/>
                             </group>
+                            <group colspan="4">
+                                <group colspan="2">
+                                    <field name="original_qty" colspan="1" readonly="1"/>
+                                    <field name="original_price" colspan="1" readonly="1"/>
+                                    <field name="original_uom" colspan="1" readonly="1"/>
+                                    <field name="original_currency_id" colspan="1" readonly="1"/>
+                                </group>
+                                <field name="modification_comment" colspan="2"/>
+                            </group>
                             <field name="vat_ok" invisible="1" />
-                            <group colspan="4" col="4" groups="base.group_extended" attrs="{'invisible': [('vat_ok', '=', False)]}">
+                            <group colspan="4" col="4" attrs="{'invisible': [('vat_ok', '=', False)]}">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
 
=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2017-10-02 07:11:25 +0000
+++ bin/addons/purchase/purchase_workflow.py	2017-10-03 16:52:18 +0000
@@ -107,6 +107,11 @@
                 'sync_sourced_origin': pol.instance_sync_order_ref and pol.instance_sync_order_ref.name or False,
                 'type': 'make_to_order',
             }
+
+            # update modification comment if it is set
+            if pol.modification_comment:
+                sol_values['modification_comment'] = pol.modification_comment
+
             if create_line:
                 sol_values.update({
                     'order_id': so_id,
@@ -284,6 +289,20 @@
             po_to_check[pol.order_id.id] = True
             if pol.linked_sol_id:
                 wf_service.trg_validate(uid, 'sale.order.line', pol.linked_sol_id.id, 'sourced_v', cr)
+            # update original qty, unit price, uom and currency on line level
+            # doesn't update original qty and uom if already set (from IR)
+            line_update = {
+                    'original_price': pol.price_unit,
+                    'original_currency_id': pol.currency_id.id
+                }
+            if not pol.original_qty:
+                line_update['original_qty'] = pol.product_qty
+
+            if not pol.original_uom:
+                line_update['original_uom'] = pol.product_uom.id
+
+            self.write(cr, uid, pol.id, line_update, context=context)
+
 
         if po_to_check:
             self.pool.get('purchase.order').check_if_stock_take_date_with_esc_partner(cr, uid, po_to_check.keys(), context=context)
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2017-09-14 08:41:12 +0000
+++ bin/addons/purchase_override/purchase.py	2017-10-03 16:52:18 +0000
@@ -159,7 +159,6 @@
 
 purchase_order_merged_line()
 
-
 class purchase_order_group(osv.osv_memory):
     _name = "purchase.order.group"
     _inherit = "purchase.order.group"
 
=== modified file 'bin/addons/purchase_override/wizard/split_order_line.py'
--- bin/addons/purchase_override/wizard/split_order_line.py	2017-08-29 12:55:18 +0000
+++ bin/addons/purchase_override/wizard/split_order_line.py	2017-10-03 16:52:18 +0000
@@ -51,7 +51,7 @@
 
     _columns = {
         'purchase_line_id': fields.many2one('purchase.order.line', string='Line Id', readonly=True),
-        'original_qty': fields.float(digits=(16,2), string='Original Quantity', readonly=True),
+        'original_qty': fields.float(string='Original Quantity', readonly=True),
         'old_line_qty': fields.float(digits=(16,2), string='Old line quantity', readonly=True),
         'new_line_qty': fields.float(digits=(16,2), string='New line quantity', required=True),
         'impact_so_split_po_line_wizard': fields.boolean('Impact Field Order', help='Impact corresponding Field Order by creating a corresponding Field Order line.'),
 
=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2017-10-02 12:27:20 +0000
+++ bin/addons/sale/sale_order.py	2017-10-03 16:52:18 +0000
@@ -1936,6 +1936,7 @@
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
         'soq_updated': fields.boolean(string='SoQ updated', readonly=True),
         'set_as_sourced_n': fields.boolean(string='Sourced-n line', help='Line created in a further PO, so we have to create it back in the flow'), # used for wkf transition
+        'modification_comment': fields.char('Modification Comment', size=1024),
     }
     _order = 'sequence, id desc'
     _defaults = {
@@ -2060,6 +2061,10 @@
             'set_as_sourced_n': False,
         })
 
+        for x in ['modification_comment', 'original_qty', 'original_price', 'original_uom']:
+            if x not in default:
+                default[x] = False
+
         return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
 
     def product_id_change_orig(self, cr, uid, ids, pricelist, product, qty=0,
 
=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2017-10-02 17:36:43 +0000
+++ bin/addons/sale/sale_view.xml	2017-10-03 16:52:18 +0000
@@ -179,6 +179,7 @@
                                             <field name="type" groups="base.group_extended"/>
                                             <field name="delay" groups="base.group_extended"/>
                                             <field name="display_resourced_orig_line"/>
+                                            <field name="modification_comment"/>
                                             <newline/>
                                             <separator colspan="5" string="Taxes"/>
                                             <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
 
=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2017-09-29 11:06:54 +0000
+++ bin/addons/sale/sale_workflow.py	2017-10-03 16:52:18 +0000
@@ -327,8 +327,11 @@
                 if sol.order_id.order_type in ['loan', 'donation_st', 'donation_exp'] and sol.type != 'make_to_stock':
                     to_write['type'] = 'make_to_stock'
 
-            elif sol.procurement_request: # in case of IR
-                pass #TODO
+            elif sol.procurement_request:  # in case of IR
+                to_write['original_qty'] = sol.product_uom_qty
+                to_write['original_price'] = sol.price_unit
+                to_write['original_uom'] = sol.product_uom.id
+                # pass #TODO
 
             if to_write:
                 self.write(cr, uid, sol.id, to_write, context=context)
 
=== modified file 'bin/addons/sale/wizard/split_order_line.py'
--- bin/addons/sale/wizard/split_order_line.py	2017-09-05 12:48:12 +0000
+++ bin/addons/sale/wizard/split_order_line.py	2017-10-03 16:52:18 +0000
@@ -32,7 +32,7 @@
 
     _columns = {
         'sale_line_id': fields.many2one('sale.order.line', string='Line Id', readonly=True),
-        'original_qty': fields.float(digits=(16,2), string='Original Quantity', readonly=True),
+        'original_qty': fields.float(string='Original Quantity', readonly=True),
         'old_line_qty': fields.float(digits=(16,2), string='Old line quantity', readonly=True),
         'new_line_qty': fields.float(digits=(16,2), string='New line quantity', required=True),
     }
 
=== removed directory 'bin/addons/sale_override'
=== removed directory 'bin/addons/sale_override/wizard'
=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2017-08-03 15:16:40 +0000
+++ bin/addons/sourcing/procurement_order.py	2017-10-03 16:52:18 +0000
@@ -114,6 +114,10 @@
                 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_qty:
+                    line.update({'original_qty': origin_line.original_qty})
+                if origin_line.original_uom:
+                    line.update({'original_uom': origin_line.original_uom.id})
             else:
                 # Update the link to the original FO to create new line on it at PO confirmation
                 procurement = kwargs['procurement']
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2017-09-25 08:50:10 +0000
+++ bin/addons/sourcing/sale_order_line.py	2017-10-03 16:52:18 +0000
@@ -1617,6 +1617,11 @@
                         'analytic_distribution_id': anal_dist,
                         'link_so_id': sourcing_line.order_id.id,
                     }
+                    if sourcing_line.procurement_request:
+                        pol_values.update({
+                            'original_qty': sourcing_line.original_qty,
+                            'original_uom': sourcing_line.original_uom.id,
+                        })
                     self.pool.get('purchase.order.line').create(cr, uid, pol_values, context=context)
                     self.pool.get('purchase.order').write(cr, uid, po_to_use, {'dest_partner_ids': [(4, sourcing_line.order_id.partner_id.id, 0)]}, context=context)
 
@@ -1645,6 +1650,11 @@
                         'analytic_distribution_id': anal_dist,
                         'link_so_id': sourcing_line.order_id.id,
                     }
+                    if sourcing_line.procurement_request:
+                        rfq_line_values.update({
+                            'original_qty': sourcing_line.original_qty,
+                            'original_uom': sourcing_line.original_uom.id,
+                        })
                     self.pool.get('purchase.order.line').create(cr, uid, rfq_line_values, context=context)
 
                 elif sourcing_line.po_cft == 'cft':
@@ -1658,7 +1668,7 @@
                     # attach tender line:
                     proc_location_id = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'procurement')], context=context)
                     proc_location_id = proc_location_id[0] if proc_location_id else False
-                    self.pool.get('tender.line').create(cr, uid, {
+                    tender_values = {
                         'product_id': sourcing_line.product_id.id,
                         'comment': sourcing_line.comment,
                         'qty': sourcing_line.product_uom_qty,
@@ -1666,7 +1676,13 @@
                         'tender_id': tender_to_use,
                         'sale_order_line_id': sourcing_line.id,
                         'location_id': proc_location_id,
-                    }, context=context)
+                    }
+                    if sourcing_line.procurement_request:
+                        tender_values.update({
+                            'original_qty': sourcing_line.original_qty,
+                            'original_uom': sourcing_line.original_uom.id,
+                        })
+                    self.pool.get('tender.line').create(cr, uid, tender_values, context=context)
 
                 wf_service.trg_validate(uid, 'sale.order.line', sourcing_line.id, 'sourced', cr)
 
 
=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2017-09-20 15:04:19 +0000
+++ bin/addons/sync_so/purchase.py	2017-10-03 16:52:18 +0000
@@ -74,6 +74,7 @@
         order_name = sol_dict['order_id']['name']
         pol_values['order_id'] = po_ids[0]
         pol_values['sync_linked_sol'] = sol_dict['sync_local_id']
+        pol_values['modification_comment'] = sol_dict.get('modification_comment', False)
         if 'line_number' in pol_values:
             del(pol_values['line_number'])
 
@@ -210,7 +211,6 @@
             ondelete='cascade',
         ),
         'original_qty': fields.float(
-            digits=(16,2),
             string='Original qty',
             required=False,
             readonly=True,