Merge lp:~mallorymarcot/unifield-server/partial_dev into lp:unifield-server

[jftempo]

[lp:~mallorymarcot/unifield-server/partial_dev]

4658. By Mallory MARCOT on 2017-09-26

Adding tc1_intermission and tc4 fro testfield

4659. By Mallory MARCOT on 2017-09-26

tc1_intermission OK

4660. By Mallory MARCOT on 2017-09-26

Fix issue taking resourced state instead of real state

4661. By Mallory MARCOT on 2017-10-02

Can now cancel a PO from header

4662. By Mallory MARCOT on 2017-10-02

If PO line is in draft state, simply remove it instead of cancelling it

Unmerged revisions

4662. By Mallory MARCOT on 2017-10-02

If PO line is in draft state, simply remove it instead of cancelling it

4661. By Mallory MARCOT on 2017-10-02

Can now cancel a PO from header

=== modified file 'bin/addons/__init__.py'
--- bin/addons/__init__.py	2016-08-31 07:58:29 +0000
+++ bin/addons/__init__.py	2017-10-02 12:34:11 +0000
@@ -409,9 +409,16 @@
 def init_module_objects(cr, module_name, obj_list):
     logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: creating or updating database tables' % module_name)
     todo = []
+    missing_fk = {}
     for obj in obj_list:
         try:
-            result = obj._auto_init(cr, {'module': module_name})
+            auto_init = obj._auto_init(cr, {'module': module_name})
+            result = None
+            if auto_init:
+                result, fk = auto_init
+                for obj, missing in fk.iteritems():
+                    missing_fk.setdefault(obj, [])
+                    missing_fk[obj] += missing
         except Exception, e:
             raise
         if result:
@@ -423,7 +430,7 @@
     for t in todo:
         t[1](cr, *t[2])
     cr.commit()
-
+    return missing_fk
 
 def register_class(m):
     """
@@ -512,7 +519,7 @@
         assert stage in ('pre', 'post')
         stageformat = {'pre': '[>%s]',
                        'post': '[%s>]',
-                      }
+                       }
 
         if not (hasattr(pkg, 'update') or pkg.state == 'to upgrade'):
             return
@@ -541,7 +548,7 @@
 
             mapping = {'module': opj(pkg.name, 'migrations'),
                        'maintenance': opj('base', 'maintenance', 'migrations', pkg.name),
-                      }
+                       }
 
             for x in mapping.keys():
                 if version in m[x]:
@@ -722,6 +729,7 @@
     modobj = None
     logger.notifyChannel('init', netsvc.LOG_DEBUG, 'loading %d packages..' % len(graph))
 
+    missing_fk = {}
     for package in graph:
         if skip_modules and package.name in skip_modules:
             continue
@@ -730,9 +738,15 @@
         register_class(package.name)
         modules = pool.instanciate(package.name, cr)
         if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
-            init_module_objects(cr, package.name, modules)
+            fk = init_module_objects(cr, package.name, modules)
+            for obj, missing in fk.iteritems():
+                missing_fk.setdefault(obj, [])
+                missing_fk[obj] += missing
         cr.commit()
 
+    for related_obj, to_create in missing_fk.iteritems():
+        for x in to_create:
+            x[0]._create_fk(cr, x[1], x[2], x[3])
     for package in graph:
         status['progress'] = (float(statusi)+0.1) / len(graph)
         m = package.name

=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
--- bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2017-08-18 13:33:40 +0000
+++ bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2017-10-02 12:34:11 +0000
@@ -492,10 +492,10 @@
         for el in self.browse(cr, uid, ids, context=context):
             res[el.id] = True
             # verify purchase state
-            if el.purchase_id and el.purchase_id.state not in ['draft', 'confirmed']:
+            if el.purchase_id and el.purchase_id.state not in ['draft', 'draft_p', 'validated_n', 'validated']:
                 res[el.id] = False
             # verify purchase line state
-            if el.purchase_line_id and el.purchase_line_id.order_id and el.purchase_line_id.order_id.state not in ['draft', 'confirmed']:
+            if el.purchase_line_id and el.purchase_line_id.order_id and el.purchase_line_id.order_id.state not in ['draft', 'validated_n', 'validated']:
                 res[el.id] = False
             # verify invoice state
             if el.invoice_id and el.invoice_id.state in ['open', 'paid']:
@@ -513,10 +513,10 @@
             if el.accrual_line_id and el.accrual_line_id.state != 'draft':
                 res[el.id] = False
             # verify sale order state
-            if el.sale_order_id and el.sale_order_id.state not in ['draft', 'validated']:
+            if el.sale_order_id and el.sale_order_id.state not in ['draft', 'draft_p', 'validated']:
                 res[el.id] = False
             # verify sale order line state
-            if el.sale_order_line_id and el.sale_order_line_id.order_id and el.sale_order_line_id.order_id.state not in ['draft', 'validated']:
+            if el.sale_order_line_id and el.sale_order_line_id.order_id and el.sale_order_line_id.order_id.state not in ['draft', 'draft_p', 'validated']:
                 res[el.id] = False
             # verify move state
             # UFTP-363: Do not edit any element of JI or JE if the JE is imported
@@ -1062,6 +1062,7 @@
                     if getattr(wiz, el[0], False):
                         obj_id = getattr(wiz, el[0], False).id
                         self.pool.get(el[1]).write(cr, uid, [obj_id], {'analytic_distribution_id': distrib_id}, context=context)
+
             # Finally do registration for each type
             new_distrib = False
             for line_type in ['cost.center', 'funding.pool', 'free.1', 'free.2']:

=== modified file 'bin/addons/analytic_distribution_supply/purchase.py'
--- bin/addons/analytic_distribution_supply/purchase.py	2017-02-07 13:18:54 +0000
+++ bin/addons/analytic_distribution_supply/purchase.py	2017-10-02 12:34:11 +0000
@@ -255,18 +255,6 @@
                         self.pool.get('account.commitment').action_commitment_done(cr, uid, [x.id for x in po.commitment_ids], context=context)
         return True
 
-    def wkf_action_cancel_po(self, cr, uid, ids, context=None):
-        """
-        Delete commitment from purchase before 'cancel' state.
-        """
-        # Some verifications
-        if not context:
-            context = {}
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        # Change commitments state if exists
-        self._finish_commitment(cr, uid, ids, context=context)
-        return super(purchase_order, self).wkf_action_cancel_po(cr, uid, ids, context=context)
 
     def action_done(self, cr, uid, ids, context=None):
         """

=== modified file 'bin/addons/analytic_distribution_supply/purchase_view.xml'
--- bin/addons/analytic_distribution_supply/purchase_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/analytic_distribution_supply/purchase_view.xml	2017-10-02 12:34:11 +0000
@@ -15,11 +15,11 @@
                         <newline />
                         <group colspan="4" col="8" attrs="{'invisible': ['|', ('analytic_distribution_id', '=', False), ('rfq_ok' ,'=', True)]}">
                             <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,confirmed"/>
+                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,validated"/>
                         </group>
                         <group colspan="4" col="8" attrs="{'invisible': ['|', ('analytic_distribution_id', '!=', False), ('rfq_ok', '=', True)]}">
                             <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,confirmed"/>
+                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,validated"/>
                         </group>
                         <field name="analytic_distribution_id" invisible="1"/>
                     </xpath>

=== modified file 'bin/addons/analytic_distribution_supply/sale_view.xml'
--- bin/addons/analytic_distribution_supply/sale_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/analytic_distribution_supply/sale_view.xml	2017-10-02 12:34:11 +0000
@@ -14,11 +14,11 @@
                     <xpath expr="/form/notebook" position="before">
                         <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
                             <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,validated"/>
+                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,draft_p,validated,validated_p"/>
                         </group>
                         <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
                             <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
-                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,validated"/>
+                            <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" states="draft,draft_p,validated,validated_p"/>
                         </group>
                         <field name="analytic_distribution_id" invisible="1"/>
                         <group colspan="3"/>

=== modified file 'bin/addons/delete_button/view/sale_view.xml'
--- bin/addons/delete_button/view/sale_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/delete_button/view/sale_view.xml	2017-10-02 12:34:11 +0000
@@ -29,7 +29,7 @@
                     <xpath expr="/tree" position="attributes">
                         <attribute name='hide_delete_button'>1</attribute>
                     </xpath>
-                    <xpath expr="/tree/field[@name='state_hidden_sale_order']" position="after">
+                    <xpath expr="/tree/field[last()]" position="after">
                         <button name="delete_button" type="object" icon="gtk-del" string="Delete" 
                         attrs="{'invisible' : [('state','!=','draft')]}" confirm='Do you really want to delete selected record(s) ?'/>
                     </xpath>

=== modified file 'bin/addons/delivery_mechanism/__openerp__.py'
--- bin/addons/delivery_mechanism/__openerp__.py	2013-03-25 16:48:26 +0000
+++ bin/addons/delivery_mechanism/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -28,7 +28,6 @@
                 "account",
                 "stock_override",
                 "purchase_override",
-                "sale_override",
                 "product_asset", # because of asset_id
                 "msf_outgoing",
                 ],

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2017-09-03 15:15:05 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2017-10-02 12:34:11 +0000
@@ -257,11 +257,10 @@
         '''
         location_dest_id = super(stock_move, self)._get_location_for_internal_request(cr, uid, context=context, **kwargs)
         move = kwargs['move']
-        if move.purchase_line_id:
-            proc = move.purchase_line_id.procurement_id
-            if proc and proc.sale_order_line_ids and proc.sale_order_line_ids[0].order_id and proc.sale_order_line_ids[0].order_id.procurement_request:
-                if proc.sale_order_line_ids[0].order_id.location_requestor_id.usage != 'customer':
-                    location_dest_id = proc.sale_order_line_ids[0].order_id.location_requestor_id.id
+        linked_sol = move.purchase_line_id.linked_sol_id or False
+        if linked_sol and linked_sol.procurement_request and linked_sol.order_id.location_requestor_id.usage != 'customer':
+            location_dest_id = linked_sol.order_id.location_requestor_id.id
+
         return location_dest_id
 
     def _do_partial_hook(self, cr, uid, ids, context, *args, **kwargs):
@@ -303,56 +302,46 @@
             ids = [ids]
 
         # objects
-        so_line_obj = self.pool.get('sale.order.line')
-
         res = {}
         for obj in self.browse(cr, uid, ids, context=context,
                                fields_to_fetch=['picking_id', 'purchase_line_id', 'id']):
             res[obj.id] = {'move_id': False, 'picking_id': False, 'picking_version': 0, 'quantity': 0, 'moves': []}
             if obj.picking_id and obj.picking_id.type == 'in':
                 # we are looking for corresponding OUT move from sale order line
-                if obj.purchase_line_id:
-                    # linekd to a po
-                    if obj.purchase_line_id.procurement_id:
-                        # on order
-                        procurement_id = obj.purchase_line_id.procurement_id.id
-                        # find the corresponding sale order line
-                        so_line_ids = so_line_obj.search(cr, uid, [('procurement_id', '=', procurement_id)], context=context)
-                        # if the procurement comes from replenishment rules, there will be a procurement, but no associated sale order line
-                        # we therefore do not raise an exception, but handle the case only if sale order lines are found
-                        if so_line_ids:
-                            # find the corresponding OUT move
-                            move_ids = self.search(cr, uid, [('product_id', '=', data_back['product_id']),
-                                                             ('state', 'in', ('assigned', 'confirmed')),
-                                                             ('sale_line_id', '=', so_line_ids[0]),
-                                                             ('in_out_updated', '=', False),
-                                                             ('picking_id.type', '=', 'out'),
-                                                             ('processed_stock_move', '=', False),
-                                                             ], order="state desc", context=context)
-                            # list of matching out moves
-                            integrity_check = []
-                            for move in self.browse(cr, uid, move_ids, context=context):
-                                pick = move.picking_id
-                                cond1 = move.picking_id.subtype == 'standard'
-                                cond2 = move.product_qty != 0.00 and pick.subtype == 'picking' and (not pick.backorder_id or pick.backorder_id.subtype == 'standard') and pick.state == 'draft'
-                                if cond2 or cond1:
-                                    integrity_check.append(move)
-                            # return the first one matching
-                            if integrity_check:
-                                if all([not move.processed_stock_move for move in integrity_check]):
-                                    # the out stock moves (draft picking or std out) have not yet been processed, we can therefore update them
-                                    res[obj.id].update({
-                                        'move_id': integrity_check[0].id,
-                                        'moves': integrity_check,
-                                        'picking_id': integrity_check[0].picking_id.id,
-                                        'picking_version': integrity_check[0].picking_id.update_version_from_in_stock_picking,
-                                        'quantity': integrity_check[0].product_qty,
-                                    })
-                                else:
-                                    # the corresponding OUT move have been processed completely or partially,, we do not update the OUT
-                                    msg_log = _('The Stock Move %s from %s has already been processed and is '
-                                                'therefore not updated.') % (integrity_check[0].name, integrity_check[0].picking_id.name)
-                                    self.log(cr, uid, integrity_check[0].id, msg_log)
+                if obj.purchase_line_id and obj.purchase_line_id.linked_sol_id:
+                    # find the corresponding OUT move
+                    move_ids = self.search(cr, uid, [('product_id', '=', data_back['product_id']),
+                                                     ('state', 'in', ('assigned', 'confirmed')),
+                                                     ('sale_line_id', '=', obj.purchase_line_id.linked_sol_id.id),
+                                                     ('in_out_updated', '=', False),
+                                                     ('picking_id.type', '=', 'out'),
+                                                     ('processed_stock_move', '=', False),
+                                                     ], order="state desc", context=context)
+                    # list of matching out moves
+                    integrity_check = []
+                    for move in self.browse(cr, uid, move_ids, context=context):
+                        pick = move.picking_id
+                        cond1 = move.picking_id.subtype == 'standard'
+                        cond2 = move.product_qty != 0.00 and pick.subtype == 'picking' and (not pick.backorder_id or pick.backorder_id.subtype == 'standard') and pick.state == 'draft'
+                        # move from draft picking or standard picking
+                        if cond2 or cond1:
+                            integrity_check.append(move)
+                    # return the first one matching
+                    if integrity_check:
+                        if all([not move.processed_stock_move for move in integrity_check]):
+                            # the out stock moves (draft picking or std out) have not yet been processed, we can therefore update them
+                            res[obj.id].update({
+                                'move_id': integrity_check[0].id,
+                                'moves': integrity_check,
+                                'picking_id': integrity_check[0].picking_id.id,
+                                'picking_version': integrity_check[0].picking_id.update_version_from_in_stock_picking,
+                                'quantity': integrity_check[0].product_qty,
+                            })
+                        else:
+                            # the corresponding OUT move have been processed completely or partially,, we do not update the OUT
+                            msg_log = _('The Stock Move %s from %s has already been processed and is '
+                                        'therefore not updated.') % (integrity_check[0].name, integrity_check[0].picking_id.name)
+                            self.log(cr, uid, integrity_check[0].id, msg_log)
 
             else:
                 # we are looking for corresponding IN from on_order purchase order
@@ -632,9 +621,6 @@
                                                                    'product_uos': data_back['product_uom'],
                                                                    'product_uos_qty': diff_qty, }, context=context)
                 move_obj.action_confirm(cr, uid, [new_move_id], context=context)
-#                if present_qty == 0.00:
-#                    move_obj.write(cr, uid, [out_move_id], {'state': 'draft'})
-#                    move_obj.unlink(cr, uid, out_move_id, context=context)
             else:
                 move_obj.write(cr, uid, [out_move_id], {'product_qty': new_qty,
                                                         'product_uom': data['product_uom'][0],
@@ -931,7 +917,6 @@
         # Objects
         inc_proc_obj = self.pool.get('stock.incoming.processor')
         move_proc_obj = self.pool.get('stock.move.in.processor')
-        proc_obj = self.pool.get('procurement.order')
         loc_obj = self.pool.get('stock.location')
         uom_obj = self.pool.get('product.uom')
         move_obj = self.pool.get('stock.move')
@@ -961,7 +946,6 @@
         backorder_id = False
 
         internal_loc = loc_obj.search(cr, uid, [('usage', '=', 'internal'), ('cross_docking_location_ok', '=', False)])
-        proc_loc_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'location_procurement')[1]
         context['location'] = internal_loc
 
         product_availability = {}
@@ -1182,6 +1166,10 @@
                 # and the remaining quantity to list of moves to put in backorder
                 if diff_qty > 0.00 and move.state != 'cancel':
                     backordered_moves.append((move, diff_qty, average_values, data_back, move_sptc_values))
+                    # decrement qty of linked INTernal move:
+                    internal_move = self.pool.get('stock.move').search(cr, uid, [('linked_incoming_move', '=', move.id)], context=context)
+                    if internal_move:
+                        move_obj.write(cr, uid, internal_move, {'product_qty': diff_qty, 'product_uos_qty': diff_qty}, context=context)
                 else:
                     for sptc_values in move_sptc_values:
                         # track change that will be created:
@@ -1190,20 +1178,10 @@
                             'transaction_name': _('Reception %s') % move.picking_id.name,
                             'sptc_values': sptc_values.copy(),
                         })
-
-                # UTP-967
-                if move.state != 'cancel' and move.purchase_line_id and move.purchase_line_id.procurement_id:
-                    proc = move.purchase_line_id.procurement_id
-                    if proc.move_id and proc.move_id.location_id.id == proc_loc_id:
-                        if diff_qty > 0:
-                            # REF-59: move of partial in,
-                            # adapt proc order's move qty (for correct virtual stock)
-                            move_obj.write(cr, uid, [proc.move_id.id],
-                                           {'product_qty': diff_qty}, context=context)
-                        else:
-                            proc_obj.write(cr, uid, [proc.id], {'move_id': move.id}, context=context)
-                            # note: do not close move until a diff qty is applied above
-                            move_obj.write(cr, uid, [proc.move_id.id], {'product_qty': 0.00, 'state': 'done'}, context=context)
+                    # cancel linked INTernal move (INT):
+                    internal_move = self.pool.get('stock.move').search(cr, uid, [('linked_incoming_move', '=', move.id)], context=context)
+                    if internal_move:
+                        move_obj.action_cancel(cr, uid, internal_move, context=context)
 
             prog_id = self.update_processing_info(cr, uid, picking_id, prog_id, {
                 'progress_line': _('Done (%s/%s)') % (move_done, total_moves),
@@ -1286,8 +1264,11 @@
                         bo_values.update(av_values)
                         context['keepLineNumber'] = True
                         context['from_button'] = False
-                        move_obj.copy(cr, uid, bo_move.id, bo_values, context=context)
+                        new_bo_move_id = move_obj.copy(cr, uid, bo_move.id, bo_values, context=context)
                         context['keepLineNumber'] = False
+                        # update linked INT move with new BO move id:
+                        internal_move = move_obj.search(cr, uid, [('linked_incoming_move', '=', bo_move.id)], context=context)
+                        move_obj.write(cr, uid, internal_move, {'linked_incoming_move': new_bo_move_id}, context=context)
 
                 # Put the done moves in this new picking
                 done_values = {'picking_id': backorder_id}
@@ -1491,13 +1472,6 @@
                             # If there are still some lines available with qty 0, then check if any in progress PICK, if all complete, then close the PICK
                             self.validate(cr, uid, [mirror_pick.id], context=context)
 
-                if move.purchase_line_id and move.purchase_line_id.procurement_id:
-                    procurement = move.purchase_line_id.procurement_id
-                    if not procurement.sale_id and procurement.move_id:
-                        self.pool.get('stock.move').action_cancel(cr, uid, [move.purchase_line_id.procurement_id.move_id.id])
-                        wf_service.trg_validate(uid, 'procurement.order', move.purchase_line_id.procurement_id.id, 'button_cancel', cr)
-
-
             # correct the corresponding po manually if exists - should be in shipping exception
             if obj.purchase_id:
                 wf_service.trg_validate(uid, 'purchase.order', obj.purchase_id.id, 'picking_ok', cr)

=== modified file 'bin/addons/delivery_mechanism/wizard/enter_reason.py'
--- bin/addons/delivery_mechanism/wizard/enter_reason.py	2015-12-04 16:00:07 +0000
+++ bin/addons/delivery_mechanism/wizard/enter_reason.py	2017-10-02 12:34:11 +0000
@@ -80,7 +80,9 @@
                 context['pol_qty'] = pol_qty
                 context['from_in_cancel'] = True
                 pol_obj.write(cr, uid, pol_ids, {'has_to_be_resourced': True}, context=context)
-                pol_obj.cancel_sol(cr, uid, pol_ids, context=context)
+                for pol in self.pool.get('purchase.order.line').browse(cr, uid, pol_ids, context=context):
+                    if pol.linked_sol_id:
+                        wf_service.trg_validate(uid, 'sale.order.line', pol.linked_sol_id.id, 'cancel', cr)
             
             # cancel the IN
             wf_service.trg_validate(uid, 'stock.picking', obj.id, 'button_cancel', cr)

=== modified file 'bin/addons/documents_done/__openerp__.py'
--- bin/addons/documents_done/__openerp__.py	2011-12-30 09:19:57 +0000
+++ bin/addons/documents_done/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -23,7 +23,7 @@
     "name": "Documents to Done",
     "version": "1.0",
     "depends": [
-        "sale_override",
+        "sale",
         "purchase_override",
         "stock_override",
         "tender_flow",

=== modified file 'bin/addons/documents_done/documents_done.py'
--- bin/addons/documents_done/documents_done.py	2017-04-19 10:05:42 +0000
+++ bin/addons/documents_done/documents_done.py	2017-10-02 12:34:11 +0000
@@ -130,30 +130,16 @@
         tender_ids = []
         invoice_ids = []
         for line in order.order_line:
-            # Check procurement orders
-            if line.procurement_id:
-                if line.procurement_id.state not in ('cancel', 'done'):
-                    proc_ids.append(line.procurement_id.id)
-                # Check PO
-                if line.procurement_id.purchase_id and line.procurement_id.purchase_id.state not in ('cancel', 'done'):
-                    po_ids.append(line.procurement_id.purchase_id.id)
-                # Check tenders
-                if line.procurement_id.tender_id and line.procurement_id.tender_id.state not in ('cancel', 'done'):
-                    tender_ids.append(line.procurement_id.tender_id.id)
-                    # Check Rfheck RfQ
-                    for rfq in line.procurement_id.tender_id.rfq_ids:
-                        if rfq.state not in ('cancel', 'done'):
-                            po_ids.append(rfq.id)
+            pol_id = self.pool.get('purchase.order.line').search(cr, uid, [('linked_sol_id', '=', line.id)], context=context)
+            po_line = self.pool.get('purchase.order.line').browse(cr, uid, pol_id[0], context=context) if pol_id else False
+            # Check PO
+            if po_line and not po_line.state.startswith(('cancel', 'done')):
+                po_ids.append(po_line.order_id.id)
 
         # Check loan counterpart
         if order.loan_id and order.loan_id.state not in ('cancel', 'done'):
             po_ids.append(order.loan_id.id)
 
-        # Invoices
-        #for invoice in order.invoice_ids:
-        #    if invoice.state not in ('cancel', 'paid'):
-        #        invoice_ids.append(invoice.id)
-
         if context.get('count', False):
             return move_ids or proc_ids or po_ids or tender_ids or invoice_ids or False
         else:
@@ -172,11 +158,6 @@
         if order.loan_id and order.loan_id.state not in ('cancel', 'done'):
             so_ids.append(order.loan_id.id)
 
-        # Invoices
-        #for invoice in order.invoice_ids:
-        #    if invoice.state not in ('cancel', 'paid'):
-        #        invoice_ids.append(invoice.id)
-
         if context.get('count', False):
             return move_ids or so_ids or invoice_ids or False
         else:

=== modified file 'bin/addons/kit/wizard/kit_selection.py'
--- bin/addons/kit/wizard/kit_selection.py	2014-07-22 12:11:45 +0000
+++ bin/addons/kit/wizard/kit_selection.py	2017-10-02 12:34:11 +0000
@@ -225,18 +225,7 @@
                                        })
                         # copy existing sol
                         last_line_id = sol_obj.copy(cr, uid, last_line_id, values, context=ctx_keep_info)
-                        # call the new procurement creation method
-                        so_obj.action_ship_proc_create(cr, uid, [obj.corresponding_so_id_kit_selection.id], context=context)
-                        # run the procurement, the make_po function detects the link to original po
-                        # and force merge the line to this po (even if it is not draft anymore)
-                        new_data_so = sol_obj.read(cr, uid, [last_line_id], ['procurement_id'], context=context)
-                        new_proc_id = new_data_so[0]['procurement_id'][0]
-                        wf_service.trg_validate(uid, 'procurement.order', new_proc_id, 'button_check', cr)
-                        # if original po line is confirmed, we action_confirm new line
-                        if obj.order_line_id_kit_selection.state == 'confirmed':
-                            # the correct line number according to new line number policy is set in po_line_values_hook of order_line_number/order_line_number.py/procurement_order
-                            new_po_ids = pol_obj.search(cr, uid, [('procurement_id', '=', new_proc_id)], context=context)
-                            pol_obj.action_confirm(cr, uid, new_po_ids, context=context)
+                        # /* code deletion for partial confirmation US-3185 */
                     else:
                         # first item to be treated, we update the existing purchase order line
                         # sale order line will be updated when the Po is confirmed

=== modified file 'bin/addons/msf_cross_docking/cross_docking.py'
--- bin/addons/msf_cross_docking/cross_docking.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_cross_docking/cross_docking.py	2017-10-02 12:34:11 +0000
@@ -39,7 +39,7 @@
     _columns = {
         'cross_docking_ok': fields.boolean('Cross docking'),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage', '<>', 'view')],
-        help="""This location is set according to the Warehouse selected, or according to the option 'Cross docking'
+                                       help="""This location is set according to the Warehouse selected, or according to the option 'Cross docking'
         or freely if you do not select 'Warehouse'.But if the 'Order category' is set to 'Transport' or 'Service',
         you cannot have an other location than 'Service'"""),
     }
@@ -75,7 +75,7 @@
             warning = {
                 'title': _('Warning'),
                 'message': _('The IR lines to an internal location sourced by one of the lines of this PO will not affected by this modification'),
-                }
+            }
         else:
             warehouse_obj = self.pool.get('stock.warehouse')
             if not warehouse_id:
@@ -113,16 +113,6 @@
         res['value']['cross_docking_ok'] = cross_docking_ok
         return res
 
-    def onchange_warehouse_id(self, cr, uid, ids,  warehouse_id, order_type, dest_address_id):
-        """ Set cross_docking_ok to False when we change warehouse.
-        @param warehouse_id: Changed id of warehouse.
-        @return: Dictionary of values.
-        """
-        res = super(purchase_order, self).onchange_warehouse_id(cr, uid, ids,  warehouse_id, order_type, dest_address_id)
-        if warehouse_id:
-            res['value'].update({'cross_docking_ok': False})
-        return res
-
     def onchange_categ(self, cr, uid, ids, category, warehouse_id, cross_docking_ok, location_id, context=None):
         """
         Check if the list of products is valid for this new category
@@ -654,7 +644,6 @@
                 todo.append(move.id)
                 self.infolog(cr, uid, "The source location of the stock move id:%s has been changed to cross-docking location" % (move.id))
         ret = True
-        picking_todo = []
         if todo:
             ret = self.write(cr, uid, todo, {'location_id': cross_docking_location, 'move_cross_docking_ok': True}, context=context)
             
@@ -688,7 +677,6 @@
             ids = [ids]
         obj_data = self.pool.get('ir.model.data')
         todo = []
-        picking_todo = []
         for move in self.browse(cr, uid, ids, context=context):
             if move.state != 'done':
                 '''

=== modified file 'bin/addons/msf_cross_docking/cross_docking_view.xml'
--- bin/addons/msf_cross_docking/cross_docking_view.xml	2017-05-10 07:09:18 +0000
+++ bin/addons/msf_cross_docking/cross_docking_view.xml	2017-10-02 12:34:11 +0000
@@ -3,47 +3,7 @@
     <data>
     
         <!-- Here we just add a boolean in the page 'Delivery and invoicing' of the purchase order form notebook -->
-        <record id="purchase_cross_docking_form_view2" model="ir.ui.view">
-            <field name="name">purchase.cross.docking.form.view2</field>
-            <field name="model">purchase.order</field>
-            <field name="type">form</field>
-            <field name="priority">45</field>
-            <field name="inherit_id" ref="purchase_override.purchase_order_type_form_view" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/group/field[@name='categ']" position="replace" >
-                        <field name="categ" on_change="onchange_categ(categ, warehouse_id, cross_docking_ok, location_id)" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
-        <record id="purchase_cross_docking_form_view" model="ir.ui.view">
-            <field name="name">purchase.cross.docking.form.view</field>
-            <field name="model">purchase.order</field>
-            <field name="type">form</field>
-            <field name="priority">25</field>
-            <field name="inherit_id" ref="purchase.purchase_order_form" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook/page[@string='Delivery &amp; Invoicing']/group/field[@name='location_id']" position="before" >
-                        <field name="cross_docking_ok"
-                            attrs="{'readonly':['|', '|', '|', ('unallocation_ok', '=', True), ('order_type', '=', 'direct'), ('allocation_setup', '=', 'unallocated'), ('state', '!=', 'draft')]}"
-                            on_change="onchange_cross_docking_ok(cross_docking_ok, warehouse_id, categ)"
-                        />
-                    </xpath>
-                    <field name="location_id" position= "replace">
-                        <!-- attrs="{'readonly':['|', ('state', 'in', ['sourced', 'split', 'rfq_updated', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice', 'confirmed_wait']), '|',('cross_docking_ok','=', True), ('categ', 'in', ['service', 'transport'])], 'invisible': [('order_type', '=', 'direct')]}"-->
-                        <!-- [UF-1689] we want the user to select only Cross Docking or Input i.e. to tick or clear the checkbox cross docking
-                        so we set the location_id always readonly-->
-                        <field name="location_id" 
-                        domain="[('usage', '=', 'internal')]"
-                        readonly="1"
-                        on_change="onchange_location_id(location_id,categ)"/>
-                    </field>
-                </data>
-            </field>
-        </record>
         
         <!-- Here we add 'purchase_id' in the context for defining a 'default_get'
          when we want to create a new stock move directly in the delivery form -->

=== modified file 'bin/addons/msf_custom_settings/view/purchase_view.xml'
--- bin/addons/msf_custom_settings/view/purchase_view.xml	2017-08-22 14:01:21 +0000
+++ bin/addons/msf_custom_settings/view/purchase_view.xml	2017-10-02 12:34:11 +0000
@@ -35,10 +35,10 @@
                             <field name="canceled_end" invisible="1" />
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,date_order,est_transport_lead_time,context)" context="{'search_default_supplier':1}"
                                 domain="[('supplier', '=', True), ('id', '!=', company_id), ('check_partner_po', '=', {'order_type':order_type, 'partner_id': partner_id, 'split_po': related_sourcing_id}),  ('check_partner_rfq', '=', tender_id), ('partner_not_int', 'in', {'type':'po', 'ids':[active_id]})]"
-                                attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'confirmed', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}" />
+                                attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'validated', 'confirmed_wait', 'confirmed', 'except_picking', 'except_invoice'])]}" />
                             <field name="partner_type"  />
-                            <field name="partner_address_id"  attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}"/>
-                            <field name="origin" attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'confirmed', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}" widget="char"/>
+                            <field name="partner_address_id"  attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'confirmed_wait', 'confirmed', 'except_picking', 'except_invoice'])]}"/>
+                            <field name="origin" attrs="{'readonly': [('state', 'in', ['sourced', 'split', 'rfq_sent', 'rfq_updated', 'done', 'cancel', 'validated', 'confirmed_wait', 'confirmed', 'except_picking', 'except_invoice'])]}" widget="char"/>
                             <field name="internal_type" string="Zone"  />
                             <field name="customer_ref" widget="char" />
                             <group colspan="2" col="3">
@@ -47,7 +47,7 @@
                                     attrs="{'invisible': [('state', 'not in', ('draft', 'confirmed'))]}" />
                             </group>
                             <field name="pricelist_id" string="Currency" domain="[('type', '=', 'purchase'), ('in_search', '=', partner_type)]"
-                            colspan="3" attrs="{'readonly': [('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}"/>
+                            colspan="3" attrs="{'readonly': [('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'confirmed', 'except_picking', 'except_invoice'])]}"/>
                         </group>
                     </xpath>
                     <xpath expr="/form/notebook" position="after">
@@ -85,36 +85,37 @@
                         <newline/>
 
                         <group colspan="4" col="16">
-                            <field name="state" readonly="1"/>
+                            <field name="state" attrs="{'invisible': [('rfq_ok', '=', True)]}" readonly="1"/>
+                            <field name="rfq_state" attrs="{'invisible': [('rfq_ok', '=', False)]}" readonly="1"/>
                             <field name="from_procurement" invisible="1" />
-                            <button name="dpo_received" string="Validate the reception" icon="terp-camera_test"
-                                attrs="{'invisible': ['|', ('state', '!=', 'approved'), ('order_type', '!=', 'direct')]}" />
-                            <button name="purchase_cancel"  type="object"
-                            attrs="{'invisible': ['|', ('state', 'not in', ['draft', 'confirmed', 'rfq_sent']), '&amp;',('partner_type', 'not in', ('external', 'esc')), ('state', '=', 'confirmed')]}" 
+                            <button name="close_lines" type="object" string="Validate the reception" icon="terp-camera_test"
+                                attrs="{'invisible': ['|', ('state', '!=', 'confirmed'), ('order_type', '!=', 'direct')]}" />
+                            <button name="purchase_cancel" type="object"
+                            attrs="{'invisible': ['|', ('rfq_state', 'not in', ['draft', 'validated', 'sent']), '&amp;',('partner_type', 'not in', ('external', 'esc')), ('state', '=', 'validated')]}" 
                             string="Cancel" icon="gtk-cancel"/>
                             <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert" attrs="{'invisible': ['|', '|', '|', '|', '|', ('canceled_end', '=', True), ('po_from_fo', '=', True), ('po_from_ir', '=', True), ('po_from_rr', '=', True), ('tender_id', '!=', False), ('state', '!=', 'cancel')]}" />
                             <!-- UTP-469 − Remove the cancel button
-                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"  attrs="{'invisible': ['|', ('tender_id', '!=', False), ('state','not in', ['approved','except_picking','except_invoice','wait'])]}"/> -->
+                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"  attrs="{'invisible': ['|', ('tender_id', '!=', False), ('state','not in', ['confirmed','except_picking','except_invoice','wait'])]}"/> -->
                             <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"  attrs="{'invisible': ['|', ('tender_id', '!=', False), ('state', '!=', 'except_picking')]}"/>
                             <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"  attrs="{'invisible': ['|', ('tender_id', '!=', False), ('state', '!=', 'except_invoice')]}"/>
                             <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok" attrs="{'invisible': ['|', ('tender_id', '!=', False), ('state', '!=', 'wait_auth')]}"/>
-                            <button name="confirm_button" states="confirmed" string="Confirm" icon="gtk-go-forward" type="object" />
-                            <button name="purchase_confirm" states="draft" string="Validate" icon="gtk-go-forward" attrs="{'invisible': ['|', ('rfq_ok', '!=', False), ('state', '!=', 'draft')]}" />
-                            <button name="rfq_sent" type="object" states="draft" string="Send RfQ" icon="gtk-go-forward" attrs="{'invisible': ['|', ('rfq_ok', '=', False), ('state', '!=', 'draft')]}" />
-                            <button name="check_rfq_updated" type="object" states="rfq_sent" string="RfQ Updated" icon="gtk-go-forward" attrs="{'invisible': ['|', ('rfq_ok', '=', False), ('state', '!=', 'rfq_sent')]}" />
-                            <button name="generate_po_from_rfq" states="done" type="object" string="Generate Po" icon="gtk-dnd-multiple" attrs="{'invisible': ['|', '|', ('tender_id', '!=', False), ('state', '!=', 'rfq_updated'), ('from_procurement', '=', True)], 'readonly': [('amount_total', '=', 0.00)]}" />
-                            <button name="rfq_done" states="rfq_updated" string="RfQ Closed" icon="gtk-go-forward" attrs="{'invisible': ['|', '|', ('tender_id', '!=', False), ('state', '!=', 'rfq_updated'), ('from_procurement', '=', True)]}" />
-                            <button name="rfq_done" states="rfq_updated" string="Continue sourcing" icon="gtk-go-forward" attrs="{'invisible': ['|', '|', ('tender_id', '!=', False), ('state', '!=', 'rfq_updated'), ('from_procurement', '=', False)]}" />
+                            <button name="validate_lines" states="draft,draft_p" string="Validate lines" type="object" icon="gtk-go-forward"/>
+                            <button name="confirm_lines" states="validated,validated_p" string="Confirm lines" icon="gtk-go-forward" type="object" />
+                            <button name="rfq_sent" type="object" string="Send RfQ" icon="gtk-go-forward" attrs="{'invisible': ['|', ('rfq_ok', '=', False), ('rfq_state', '!=', 'draft')]}" />
+                            <button name="check_rfq_updated" type="object" string="RfQ Updated" icon="gtk-go-forward" attrs="{'invisible': ['|', ('rfq_ok', '=', False), ('rfq_state', '!=', 'sent')]}" />
+                            <button name="generate_po_from_rfq" type="object" string="Generate Po" icon="gtk-dnd-multiple" attrs="{'invisible': ['|', '|', ('tender_id', '!=', False), ('rfq_state', '!=', 'updated'), ('from_procurement', '=', True)], 'readonly': [('amount_total', '=', 0.00)]}" />
+                            <button name="rfq_done" string="RfQ Closed" icon="gtk-go-forward" attrs="{'invisible': ['|', '|', ('tender_id', '!=', False), ('rfq_state', '!=', 'updated'), ('from_procurement', '=', True)]}" />
+                            <button name="rfq_done" string="Continue sourcing" icon="gtk-go-forward" attrs="{'invisible': ['|', '|', ('tender_id', '!=', False), ('rfq_state', '!=', 'updated'), ('from_procurement', '=', False)]}" />
                         </group>
                     </xpath>
                     <xpath expr="/form//field[@name='pricelist_id']" position="replace">
                         <group colspan="2" col="3">
                             <field name="no_line" invisible="1" />
                             <field name="pricelist_id" string="Currency" colspan="2" 
-                                   attrs="{'readonly': ['|', ('no_line', '=', False), ('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}"
+                                   attrs="{'readonly': ['|', ('no_line', '=', False), ('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'confirmed', 'except_picking', 'except_invoice'])]}"
                                    domain="[('type', '=', 'purchase'), ('in_search', '=', partner_type)]" />
                             <button name="change_currency" string="Change currency" icon="terp-dolar" type="object" 
-                                    attrs="{'invisible': ['|', ('no_line', '=', True), ('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}" />
+                                    attrs="{'invisible': ['|', ('no_line', '=', True), ('state', 'in', ['rfq_updated', 'done', 'cancel', 'confirmed_wait', 'confirmed', 'except_picking', 'except_invoice'])]}" />
                             </group>
                             <button colspan="4" string="Round Qty to SoQ" type="object" name="round_to_soq" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'draft')]}" />
                     </xpath>

=== modified file 'bin/addons/msf_custom_settings/view/sale_view.xml'
--- bin/addons/msf_custom_settings/view/sale_view.xml	2017-08-01 15:45:31 +0000
+++ bin/addons/msf_custom_settings/view/sale_view.xml	2017-10-02 12:34:11 +0000
@@ -53,7 +53,7 @@
                                 <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="order_confirm" states="validated" string="Confirm Order" icon="gtk-apply" invisible="True" />
                                 <button name="do_order_confirm_method" type="object" states="validated" string="Confirm Order" icon="gtk-apply" confirm="You are about to confirm the Field Order without going through the sourcing tool. Are you sure?" attrs="{'readonly': [('no_line', '=', True)]}" />
-                                <button name="order_validated" string="Validate Order" icon="terp-check" states="draft" attrs="{'readonly': [('no_line', '=', True)]}" />
+                                <button name="validate_lines" type="object" string="Validate Lines" icon="terp-check" states="draft,draft_p" attrs="{'readonly': [('no_line', '=', True)]}" />
                             </group>
                     </xpath>
                     <xpath expr="/form//field[@name='pricelist_id']" position="replace">

=== modified file 'bin/addons/msf_doc_import/__openerp__.py'
--- bin/addons/msf_doc_import/__openerp__.py	2017-05-22 16:04:34 +0000
+++ bin/addons/msf_doc_import/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -70,8 +70,6 @@
         'wizard/wiz_common_import_view.xml',
         'data/msf_doc_import_data.xml',
         'data/inactive_categ.xml',
-        'workflow/purchase_workflow.xml',
-        'workflow/sale_workflow.xml',
         'workflow/tender_flow_workflow.xml',
         'workflow/procurement_request_workflow.xml',
         'doc_import_report.xml',

=== modified file 'bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml'
--- bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2017-01-16 14:20:41 +0000
+++ bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2017-10-02 12:34:11 +0000
@@ -42,9 +42,6 @@
                     </field>
                 </xpath>
                 <xpath expr="/form/notebook/page[@string='Purchase Order']/field[@name='order_line']" position="before" >
-                    <button name="wizard_import_po_line" string="Import RfQ lines" icon="gtk-dnd" type="object" attrs="{'invisible':[('state', '!=', 'rfq_sent')]}"/>
-                </xpath>
-                <xpath expr="/form/notebook/page[@string='Purchase Order']/field[@name='order_line']" position="before" >
                   <group name="import" string=" Import Lines " colspan="1" col="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
                     <button name="wizard_import_po_line" string="Import lines" icon="gtk-dnd" col="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
                     <button name="button_remove_lines" string="Delete Lines" icon="gtk-remove" colspan="1" type="object" attrs="{'invisible': ['|', ('po_from_fo', '=', True), ('po_from_ir', '=', True)]}" />
@@ -52,8 +49,60 @@
                     <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" context="{'rfq_ok': rfq_ok}"/>
                     <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object" />
                 </group>
-                <button name="wizard_import_file" string="Import PO confirmation" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'confirmed')]}"/>
-                <button name="export_po_integration" string="Export PO Validated" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'confirmed')]}"/>
+                <button name="wizard_import_file" string="Import PO confirmation" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible':[('state', 'not in', ['validated', 'validated_n', 'validated_p'])]}"/>
+                <button name="export_po_integration" string="Export PO Validated" icon="gtk-execute" colspan="1" type="object" attrs="{'invisible':[('state', 'not in', ['validated', 'validated_n', 'validated_p'])]}"/>
+                </xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="rfq_form_import" model="ir.ui.view">
+            <field name="name">rfq.form.import</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="priority">110</field>
+            <field name="inherit_id" ref="tender_flow.view_rfq_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form" position="attributes">
+                        <attribute name="noteditable">import_in_progress==True or update_in_progress==True</attribute>
+                    </xpath>
+                    <xpath expr="/form//field" position="before">
+                        <field name="update_in_progress" invisible="1" readonly="1" />
+                    </xpath>
+
+                <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='currency_id']" position="after">
+                    <field name="to_correct_ok" invisible="1"/>
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='order_line']/tree//field[@name='default_name']" position="after">
+                    <field name="inactive_product" invisible="1" />
+                    <field name="soq_updated" invisible="1" readonly="1" />
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='order_line']/tree" position="attributes" >
+                    <attribute name="colors">red:to_correct_ok == True or inactive_product == True or red_color == True; #C8C8C8: fake_state == 'cancel'; orange:product_qty == 0.00;blue: soq_updated == True</attribute>
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Notes']/field[@name='notes']" position="before">
+                    <field name="import_in_progress" readonly="1" invisible="0" />
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Notes']/field[@name='project_ref']" position="after">
+                    <separator colspan="4" string="Sourcing group" />
+                    <field name="related_sourcing_id" readonly="True" />
+                    <separator colspan="4" string="Import filenames" />
+                    <field name="import_filenames" mode="tree" readonly="1" nolabel="1" colspan="4">
+                        <tree string="Imported filenames">
+                            <field name="timestamp" />
+                            <field name="filename" />
+                        </tree>
+                    </field>
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='order_line']" position="before" >
+                    <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('rfq_state', '!=', 'draft')]}">
+                        <button name="wizard_import_po_line" string="Import lines" icon="gtk-dnd" col="1" type="object"/>
+                        <button name="button_remove_lines" string="Delete Lines" icon="gtk-remove" colspan="1" type="object" attrs="{'invisible': ['|', ('po_from_fo', '=', True), ('po_from_ir', '=', True)]}" />
+                        <button name="button_remove_lines" string="Delete Lines" confirm="This document originated from an IR/FO, if you delete these products now, they will all be deleted. If you wish to Cancel &amp; Resource them, please do this line by line." icon="gtk-remove" colspan="1" type="object" attrs="{'invisible': [('po_from_fo', '=', False), ('po_from_ir', '=', False)]}" />
+                        <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" context="{'rfq_ok': rfq_ok}"/>
+                        <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object" />
+                    </group>
                 </xpath>
                 </data>
             </field>

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2016-12-06 11:15:12 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2017-10-02 12:34:11 +0000
@@ -163,6 +163,7 @@
                         'default_code': False,
                         'confirmed_delivery_date': False,
                         'line_number': '',
+                        'set_as_validated_n': True,
                     }
 
                     col_count = len(row)

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2016-12-05 09:13:30 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2017-10-02 12:34:11 +0000
@@ -29,6 +29,7 @@
 from lxml.etree import XMLSyntaxError
 import logging
 import os
+import netsvc
 
 from mx import DateTime
 
@@ -1540,6 +1541,7 @@
         line_obj = self.pool.get('purchase.order.line')
         split_obj = self.pool.get('split.purchase.order.line.wizard')
         simu_obj = self.pool.get('wizard.import.po.simulation.screen')
+        wf_service = netsvc.LocalService("workflow")
 
         if context is None:
             context = {}
@@ -1561,7 +1563,7 @@
                 # Don't do anything
                 continue
             elif line.type_change == 'del' and line.po_line_id:
-                line_obj.fake_unlink(cr, uid, [line.po_line_id.id], context=context)
+                wf_service.trg_validate(uid, 'purchase.order.line', line.po_line_id.id, 'cancel', cr)
             elif line.type_change == 'split' and line.parent_line_id:
                 # Call the split line wizard
                 po_line_id = False
@@ -1596,6 +1598,7 @@
                     line_vals = {'product_uom': line.imp_uom.id,
                                  'product_id': line.imp_product_id.id,
                                  'price_unit': line.imp_price,
+                                 'set_as_validated_n': True,
                                  }
                     if line.imp_drd:
                         line_vals['date_planned'] = line.imp_drd
@@ -1641,6 +1644,7 @@
                              'price_unit': line.imp_price,
                              'product_qty': line.imp_qty,
                              'date_planned': line.imp_drd or line.simu_id.order_id.delivery_requested_date,
+                             'set_as_validated_n': True,
                              }
                 if line.imp_dcd:
                     line_vals['confirmed_delivery_date'] = line.imp_dcd

=== modified file 'bin/addons/msf_doc_import/workflow/procurement_request_workflow.xml'
--- bin/addons/msf_doc_import/workflow/procurement_request_workflow.xml	2012-07-20 13:52:00 +0000
+++ bin/addons/msf_doc_import/workflow/procurement_request_workflow.xml	2017-10-02 12:34:11 +0000
@@ -7,11 +7,13 @@
     
     <!-- We redefined this transition to enhance the coverage of the condition -->
     
+<!--
         <record id="procurement_request.trans_proc_validate" model="workflow.transition">
             <field name="act_from" ref="procurement_request.act_procurement"/>
             <field name="act_to" ref="procurement_request.act_proc_validate"/>
             <field name="signal">procurement_validate</field>
             <field name="condition">procurement_request==True and check_lines_to_fix()</field>
         </record>
+-->
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== removed file 'bin/addons/msf_doc_import/workflow/purchase_workflow.xml'
--- bin/addons/msf_doc_import/workflow/purchase_workflow.xml	2013-05-08 08:57:30 +0000
+++ bin/addons/msf_doc_import/workflow/purchase_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="purchase.trans_draft_confirmed" model="workflow.transition">
-            <field name="condition">check_lines_to_fix()</field>
-        </record>
-        <record id="purchase.trans_confirmed_cancel" model="workflow.transition">
-            <field name="condition">check_condition()</field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file

=== removed file 'bin/addons/msf_doc_import/workflow/sale_workflow.xml'
--- bin/addons/msf_doc_import/workflow/sale_workflow.xml	2012-07-20 13:52:00 +0000
+++ bin/addons/msf_doc_import/workflow/sale_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="sale_override.trans_draft_validated" model="workflow.transition">
-            <field name="condition">check_lines_to_fix()</field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file

=== modified file 'bin/addons/msf_order_date/__openerp__.py'
--- bin/addons/msf_order_date/__openerp__.py	2012-02-27 16:26:55 +0000
+++ bin/addons/msf_order_date/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -23,11 +23,10 @@
     "name": "MSF Order dates",
     "version": "3.0",
     "depends": ["base",
-                "sale",
                 "purchase",
                 "account",
                 "stock_override",
-                "sale_override",
+                "sale",
                 "purchase_override",
                 "partner_modification",
                 "msf_tools",

=== modified file 'bin/addons/msf_order_date/order_dates.py'
--- bin/addons/msf_order_date/order_dates.py	2017-08-25 15:37:51 +0000
+++ bin/addons/msf_order_date/order_dates.py	2017-10-02 12:34:11 +0000
@@ -32,7 +32,7 @@
 from msf_order_date import TRANSPORT_TYPE
 from msf_order_date import ZONE_SELECTION
 from purchase_override import PURCHASE_ORDER_STATE_SELECTION
-from sale_override import SALE_ORDER_STATE_SELECTION
+from sale import SALE_ORDER_STATE_SELECTION
 
 class res_partner(osv.osv):
     _name = 'res.partner'
@@ -437,13 +437,7 @@
     if context is None:
         context = {}
 
-    order_id = context.get('active_id', [])
-    if isinstance(order_id, (int, long)):
-        order_id = [order_id]
-
-
     return {'value': {'date_planned': requested_date, }}
-#                      'confirmed_delivery_date': confirmed_date}}
 
 def common_create(self, cr, uid, data, type, context=None):
     '''
@@ -929,6 +923,8 @@
 
         for order in self.browse(cr, uid, ids, context=context):
             # Fill partner type
+            if data.get('partner_id') and isinstance(data.get('partner_id'), basestring):
+                data['partner_id'] = int(data.get('partner_id'))
             partner = self.pool.get('res.partner').browse(cr, uid, data.get('partner_id', order.partner_id.id), context=context)
             # partner type - always set
             data.update({'partner_type': partner.partner_type, })

=== modified file 'bin/addons/msf_order_date/order_dates_view.xml'
--- bin/addons/msf_order_date/order_dates_view.xml	2017-08-01 15:45:31 +0000
+++ bin/addons/msf_order_date/order_dates_view.xml	2017-10-02 12:34:11 +0000
@@ -36,20 +36,20 @@
                         <group colspan="4" col="4">
                             <separator colspan="4" string="Dates" />
                             <group colspan="2" col="3">
-	                            <field name="delivery_requested_date" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed'))]}"
+	                            <field name="delivery_requested_date" attrs="{'readonly': [('state', 'not in', ('draft', 'validated'))]}"
 	                            	on_change="onchange_requested_date(partner_id,date_order,delivery_requested_date,est_transport_lead_time, order_type, context)" />
 	                            <button colspan="1" name="update_date" string="Update Lines" type="object" context="{'field_name': 'requested', 'type': 'purchase.order'}" icon="gtk-indent"
-	                            	attrs="{'invisible': [('state', 'not in', ('draft', 'confirmed'))]}" />
+	                            	attrs="{'invisible': [('state', 'not in', ('draft', 'validated'))]}" />
                             </group>
                             <group colspan="2" col="3">
-	                            <field name="delivery_confirmed_date" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed'))]}" />
+	                            <field name="delivery_confirmed_date" attrs="{'readonly': [('state', 'not in', ('draft', 'validated'))]}" />
 	                            <button colspan="1" name="update_date" string="Update Lines" type="object" context="{'field_name': 'confirmed', 'type': 'purchase.order'}" icon="gtk-indent" 
-	                            	attrs="{'invisible': [('state', 'not in', ('draft', 'confirmed'))]}" />
+	                            	attrs="{'invisible': [('state', 'not in', ('draft', 'validated'))]}" />
                             </group>
                             <field name="transport_type"
                             	on_change="onchange_transport_type(partner_id,transport_type,delivery_requested_date,context)"
-                            	attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed'))]}" />
-                            <field name="est_transport_lead_time" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed'))]}" />
+                            	attrs="{'readonly': [('state', 'not in', ('draft', 'validated'))]}" />
+                            <field name="est_transport_lead_time" attrs="{'readonly': [('state', 'not in', ('draft', 'validated'))]}" />
                             <field name="ready_to_ship_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'in', ['split', 'sourced'])], 'invisible': [('partner_type', '=', 'external')]}" />
                             <field name="shipment_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'in', ['split', 'sourced'])], 'invisible': [('partner_type', '=', 'external')]}" />
                             <field name="arrival_date" attrs="{'readonly': ['|', ('shipped_rate', '!=', 0.0), ('state', '=', 'done')], 'invisible': [('internal_type', '!=', 'international')]}" />
@@ -60,7 +60,7 @@
 					<xpath expr="/form//field[@name='order_type']" position="replace">
 					    <field name="order_type"
                                on_change="onchange_internal_type(order_type, partner_id, categ, dest_partner_id, warehouse_id,delivery_requested_date)"
-                               attrs="{'readonly': ['|', ('push_fo', '=', True), ('state', 'not in', ['draft', 'confirmed'])]}"
+                               attrs="{'readonly': ['|', ('push_fo', '=', True), ('state', 'not in', ['draft', 'validated'])]}"
                         />
 					</xpath>
                     
@@ -150,7 +150,7 @@
                     
                     <xpath expr="/form/notebook//field[@name='order_line']/form/notebook//field[@name='delay']" position="replace">
                     	<field name="so_state_stored" invisible="True" />
-                        <field name="date_planned" attrs="{'readonly': [('so_state_stored', 'not in', ['draft', 'validated'])]}" />
+                        <field name="date_planned" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
                         <field name="confirmed_delivery_date" attrs="{'readonly': [('so_state_stored', 'in', ('cancel','done'))]}" />
                         <field name="stock_take_date" />
                     </xpath>

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-09-03 15:15:05 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2017-10-02 12:34:11 +0000
@@ -1663,6 +1663,10 @@
                 # UF-1617: set the flag to this packing object to indicate that the SHIP has been done, for synchronisation purpose
                 cr.execute('update stock_picking set already_shipped=\'t\' where id=%s' % packing.id)
 
+                # closing FO lines:
+                for stock_move in packing.move_lines:
+                    if stock_move.sale_line_id:
+                        wf_service.trg_validate(uid, 'sale.order.line', stock_move.sale_line_id.id, 'done', cr)
 
             # Create automatically the invoice
             self.shipment_create_invoice(cr, uid, shipment.id, context=context)
@@ -3412,6 +3416,8 @@
                     # Update the original move
                     move_obj.write(cr, uid, [move.id], values, context=context)
                     processed_moves.append(move.id)
+                    if move.sale_line_id:
+                        wf_service.trg_validate(uid, 'sale.order.line', move.sale_line_id.id, 'done', cr)
 
             if not len(move_data):
                 pick_type = 'Internal picking'
@@ -4967,11 +4973,11 @@
             Confirm or check the procurement order associated to the stock move
         '''
         pol_obj = self.pool.get('purchase.order.line')
-        proc_obj = self.pool.get('procurement.order')
         pick_obj = self.pool.get('stock.picking')
         sol_obj = self.pool.get('sale.order.line')
         uom_obj = self.pool.get('product.uom')
         solc_obj = self.pool.get('sale.order.line.cancel')
+        wf_service = netsvc.LocalService("workflow")
 
         if context is None:
             context = {}
@@ -5021,8 +5027,10 @@
 
                     diff_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, sol.product_uom.id)
                     if move.has_to_be_resourced or move.picking_id.has_to_be_resourced:
-                        sol_obj.add_resource_line(cr, uid, sol.id, False, diff_qty, context=context)
-                    sol_obj.update_or_cancel_line(cr, uid, sol.id, diff_qty, context=context)
+                        sol_obj.add_resource_line(cr, uid, sol.id, sol.order_id.id, diff_qty, context=context)
+                    sol_obj.update_or_cancel_line(cr, uid, sol.id, diff_qty, resource=move.has_to_be_resourced,context=context)
+                    signal = 'cancel_r' if move.has_to_be_resourced else 'cancel'
+                    wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, signal, cr)
 
                     # Cancel the remaining OUT line
                     if diff_qty < sol.product_uom_qty:
@@ -5041,21 +5049,9 @@
                 diff_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.sale_line_id.product_uom.id)
                 if diff_qty:
                     if move.has_to_be_resourced or move.picking_id.has_to_be_resourced:
-                        sol_obj.add_resource_line(cr, uid, move.sale_line_id.id, False, diff_qty, context=context)
+                        sol_obj.add_resource_line(cr, uid, move.sale_line_id.id, move.sale_line_id.order_id.id, diff_qty, context=context)
                     if move.id not in context.get('not_resource_move', []):
-                        sol_obj.update_or_cancel_line(cr, uid, move.sale_line_id.id, diff_qty, context=context)
-                if move.sale_line_id.procurement_id:
-                    # Search OUT moves that have the same source and there are done
-                    other_out_move_ids = self.search(cr, uid, [
-                        ('sale_line_id', '=', move.sale_line_id.id),
-                        ('state', 'in', ['assigned', 'confirmed', 'done']),
-                        ('id', '!=', move.id),
-                    ], context=context)
-                    if other_out_move_ids:
-                        proc_obj.write(cr, uid,
-                                       [move.sale_line_id.procurement_id.id],
-                                       {'move_id': other_out_move_ids[0]},
-                                       context=context)
+                        sol_obj.update_or_cancel_line(cr, uid, move.sale_line_id.id, diff_qty, resource=move.has_to_be_resourced, context=context)
 
         self.action_done(cr, uid, move_to_done, context=context)
 
@@ -5063,16 +5059,6 @@
         ids = self.search(cr, uid, [('id', 'in', ids)])
         res = super(stock_move, self).action_cancel(cr, uid, ids, context=context)
 
-        wf_service = netsvc.LocalService("workflow")
-
-        proc_obj = self.pool.get('procurement.order')
-        proc_ids = proc_obj.search(cr, uid, [('move_id', 'in', ids)], context=context)
-        for proc in proc_obj.read(cr, uid, proc_ids, ['state'], context=context):
-            if proc['state'] == 'draft':
-                wf_service.trg_validate(uid, 'procurement.order', proc['id'], 'button_confirm', cr)
-            else:
-                wf_service.trg_validate(uid, 'procurement.order', proc['id'], 'button_check', cr)
-
         for ptc in pick_obj.browse(cr, uid, list(pick_to_check), context=context):
             if ptc.subtype == 'picking' and ptc.state == 'draft' and not pick_obj.has_picking_ticket_in_progress(cr, uid, [ptc.id], context=context)[ptc.id] and all(m.state == 'cancel' or m.product_qty == 0.00 for m in ptc.move_lines):
                 moves_to_done = self.search(cr, uid, [('picking_id', '=', ptc.id), ('product_qty', '=', 0.00), ('state', 'not in', ['done', 'cancel'])], context=context)

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2017-05-23 15:47:57 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2017-10-02 12:34:11 +0000
@@ -353,7 +353,7 @@
                                 <field name="has_draft_moves" invisible="1" />
                                 <button name="action_confirm_moves" states="draft" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': [('has_draft_moves', '=', False)]}"/>
 								<button name="action_assign" states="draft,confirmed,assigned" string="Check Availability" type="object" icon="gtk-find" context="{'from_button': True}"/>
-								<button name="convert_to_standard" states="draft,assigned" string="Convert to Simple Out" type="object" icon="gtk-convert" context="{'from_button': True}" />
+								<button name="convert_to_standard" states="draft" string="Convert to Simple Out" type="object" icon="gtk-convert" context="{'from_button': True}" />
 								<button name="create_picking" states="draft" string="Create Picking..." type="object" icon="gtk-add" help="Non available quantities will not be moved and will remain in the backorder document (unless you 'force availability' if you are sure goods are available)" context="{'from_button': True}" />
 								<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to" context="{'from_button': True}" />
 								<button name="validate_picking" states="assigned" string="Validate Picking..." type="object" icon="gtk-apply"  context="{'from_button': True}" />

=== modified file 'bin/addons/msf_processes/process/procurement_process.xml'
--- bin/addons/msf_processes/process/procurement_process.xml	2012-06-07 15:50:33 +0000
+++ bin/addons/msf_processes/process/procurement_process.xml	2017-10-02 12:34:11 +0000
@@ -104,7 +104,7 @@
         </record>
         
         <!-- transitions -->
-        
+<!--
         <record id="procurement.process_transition_draft_confirmed" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Procurement Order&quot;&quot;&quot;" name="name"/>
@@ -113,7 +113,7 @@
             <field model="process.node" name="target_node_id" ref="procurement.process_node_procure_confirmed"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
-        
+
         <record id="procurement.process_transition_confirmed_exception" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;The Procurement Order goes in exception&quot;&quot;&quot;" name="name"/>
@@ -176,7 +176,7 @@
             <field model="process.node" name="target_node_id" ref="procurement.process_node_procure_po"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
-        
+
         <record id="procurement.process_transition_po_in" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Incoming Products is created.&quot;&quot;&quot;" name="name"/>
@@ -185,7 +185,7 @@
             <field model="process.node" name="target_node_id" ref="procurement.process_node_procure_in"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
-        
+-->
         <!-- Process process Service -->
         
 		<record id="procurement.process_process_serviceproductprocess0" model="process.process">

=== modified file 'bin/addons/msf_processes/process/purchase_process.xml'
--- bin/addons/msf_processes/process/purchase_process.xml	2012-07-05 14:39:47 +0000
+++ bin/addons/msf_processes/process/purchase_process.xml	2017-10-02 12:34:11 +0000
@@ -171,7 +171,7 @@
         <!--
             Process Transition
         -->
-        
+<!--
         <record id="purchase.process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
@@ -180,7 +180,7 @@
             <field model="process.node" name="source_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
         </record>
- 
+-->
         <record id="purchase.process_transition_confirmingpurchaseorder1" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
@@ -265,7 +265,7 @@
         <!--
             Process Action
         -->
-
+<!--
         <record id="purchase.process_transition_action_confirmpurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;wkf_confirm_order&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
@@ -293,7 +293,7 @@
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="purchase.process_transition_approvingpurchaseorder0"/>
         </record>
-<!-- 
+
         <record id="purchase.process_transition_action_invoicefrompurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>

=== modified file 'bin/addons/msf_processes/process/sale_process.xml'
--- bin/addons/msf_processes/process/sale_process.xml	2012-06-07 15:50:33 +0000
+++ bin/addons/msf_processes/process/sale_process.xml	2017-10-02 12:34:11 +0000
@@ -210,7 +210,7 @@
         <!--
             Process Transition
         -->
-        
+<!--
         <record id="sale.process_transition_validatequotation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Field Order&quot;&quot;&quot;" name="name"/>
@@ -237,7 +237,7 @@
             <field model="process.node" name="target_node_id" ref="sale.process_node_saleorder_done"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
-
+-->
         <record id="sale.process_transition_saleprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
@@ -308,7 +308,7 @@
         <!--
             Process Action
         -->
-
+<!--
         <record id="sale.process_transition_action_confirm0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_wait&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
@@ -364,7 +364,7 @@
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="sale.process_transition_deliver0"/>
         </record>
-<!-- 
+
         <record id="sale.process_transition_action_createinvoice0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>

=== modified file 'bin/addons/msf_profile/__openerp__.py'
--- bin/addons/msf_profile/__openerp__.py	2017-08-21 10:09:52 +0000
+++ bin/addons/msf_profile/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -40,7 +40,7 @@
         "account_period_closing_level",
         # As register_accounting has account_override and purchase_override dependancies, no need to add them after that
         #"purchase_override",
-        "sale_override",
+        "sale",
         "stock_override",
         "msf_order_date",
         "purchase_compare_rfq",
@@ -116,7 +116,6 @@
     "update_xml": [
         "security/ir.model.access.csv",
         "report.xml",
-        "purchase_double_validation_workflow.xml",
         "usability.xml",
         "user_access_configurator_view.xml",
         "unifield_version_view.xml",

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-09-18 12:35:40 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-10-02 12:34:11 +0000
@@ -98454,7 +98454,7 @@
 "- 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide."
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:168
+#: code:addons/msf_doc_import/wizard/wizard_import_invoice_line.py:184
 #, python-format
 msgid "\n"
 "- 'Account Type' should be in ('expense', 'income', 'receivables')."

=== removed file 'bin/addons/msf_profile/purchase_double_validation_workflow.xml'
--- bin/addons/msf_profile/purchase_double_validation_workflow.xml	2012-06-27 15:03:40 +0000
+++ bin/addons/msf_profile/purchase_double_validation_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-         <record id="purchase.trans_confirmed_router" model="workflow.transition">
-            <field name="condition">amount_total &gt;= 0</field>
-            <field name="signal">purchase_approve</field>
-            <field name="group_id" ref="purchase.group_purchase_manager"/>
-        </record>
-
-        <record id="purchase_double_validation.trans_waiting_confirmed" model="workflow.transition">
-            <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="purchase.act_router"/>
-            <field name="condition">amount_total &lt; 0</field>
-        </record>
-
-    </data>
-</openerp>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_10-lines-removed_all-groups.xml'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_10-lines-removed_all-groups.xml	2016-11-14 11:27:07 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_10-lines-removed_all-groups.xml	2017-10-02 12:34:11 +0000
@@ -2158,7 +2158,7 @@
     <Cell><Data ss:Type="String">YES</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_localisation</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">Localisation</Data></Cell>
@@ -2173,7 +2173,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Countries</Data></Cell>
@@ -2188,7 +2188,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_state_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Fed. States</Data></Cell>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_10-lines-removed_no-cashier_no-productManager.xml'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_10-lines-removed_no-cashier_no-productManager.xml	2016-11-14 11:27:07 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_10-lines-removed_no-cashier_no-productManager.xml	2017-10-02 12:34:11 +0000
@@ -2002,7 +2002,7 @@
     <Cell><Data ss:Type="String">YES</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_localisation</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">Localisation</Data></Cell>
@@ -2016,7 +2016,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Countries</Data></Cell>
@@ -2030,7 +2030,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_state_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Fed. States</Data></Cell>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_all-groups.xml'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_all-groups.xml	2016-11-14 11:27:07 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_all-groups.xml	2017-10-02 12:34:11 +0000
@@ -2297,7 +2297,7 @@
     <Cell><Data ss:Type="String">YES</Data></Cell>
    </Row>
    <Row>
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_localisation</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">Localisation</Data></Cell>
@@ -2312,7 +2312,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row>
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Countries</Data></Cell>
@@ -2327,7 +2327,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row>
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_state_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Fed. States</Data></Cell>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_all-groups_misformed_no-header.xml'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_all-groups_misformed_no-header.xml	2016-11-14 11:27:07 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_all-groups_misformed_no-header.xml	2017-10-02 12:34:11 +0000
@@ -2273,7 +2273,7 @@
     <Cell><Data ss:Type="String">YES</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_localisation</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">Localisation</Data></Cell>
@@ -2288,7 +2288,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Countries</Data></Cell>
@@ -2303,7 +2303,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_state_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Fed. States</Data></Cell>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_no-cashier_no-productManager.xml'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_no-cashier_no-productManager.xml	2016-11-14 11:27:07 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_no-cashier_no-productManager.xml	2017-10-02 12:34:11 +0000
@@ -2131,7 +2131,7 @@
     <Cell><Data ss:Type="String">YES</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_localisation</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">Localisation</Data></Cell>
@@ -2145,7 +2145,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Countries</Data></Cell>
@@ -2159,7 +2159,7 @@
     <Cell><Data ss:Type="String">NO</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_state_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Fed. States</Data></Cell>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_no-groups.xml'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_no-groups.xml	2016-11-14 11:27:07 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_all-lines_no-groups.xml	2017-10-02 12:34:11 +0000
@@ -930,19 +930,19 @@
     <Cell><Data ss:Type="String">Reconfigure</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_localisation</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">Localisation</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Countries</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">sale_override</Data></Cell>
+    <Cell><Data ss:Type="String">sale</Data></Cell>
     <Cell><Data ss:Type="String">menu_country_state_partner</Data></Cell>
     <Cell><Data ss:Type="String">++</Data></Cell>
     <Cell><Data ss:Type="String">Fed. States</Data></Cell>

=== modified file 'bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_original.csv'
--- bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_original.csv	2013-03-07 16:41:45 +0000
+++ bin/addons/msf_profile/test/user_rights_test_files/user_rights_01_original.csv	2017-10-02 12:34:11 +0000
@@ -148,9 +148,9 @@
 base;menu_ir_property_form_all;+++;Configuration Parameters;NO;NO;NO;NO;NO;NO;NO;NO;NO;YES;YES;NO;NO;NO;NO;NO;NO;NO
 msf_instance;menu_action_msf_instance_tree;++;Proprietary Instances;NO;NO;NO;NO;NO;NO;NO;NO;NO;YES;YES;NO;NO;NO;NO;NO;NO;NO
 base;menu_view_base_module_configuration;++;Reconfigure;NO;NO;NO;NO;NO;NO;NO;NO;NO;YES;YES;NO;NO;NO;NO;NO;NO;YES
-sale_override;menu_localisation;0;Localisation;;;;;;;;;;YES;YES;NO;NO;NO;NO;NO;NO;NO
-sale_override;menu_country_partner;++;Countries;;;;;;;;;;YES;YES;NO;NO;NO;NO;NO;NO;NO
-sale_override;menu_country_state_partner;++;Fed. States;;;;;;;;;;YES;YES;NO;NO;NO;NO;NO;NO;NO
+sale;menu_localisation;0;Localisation;;;;;;;;;;YES;YES;NO;NO;NO;NO;NO;NO;NO
+sale;menu_country_partner;++;Countries;;;;;;;;;;YES;YES;NO;NO;NO;NO;NO;NO;NO
+sale;menu_country_state_partner;++;Fed. States;;;;;;;;;;YES;YES;NO;NO;NO;NO;NO;NO;NO
 base;menu_custom;0;Customization;NO;NO;NO;NO;NO;NO;NO;NO;NO;YES;YES;NO;NO;NO;NO;NO;NO;NO
 base;next_id_2;++;User Interface;NO;NO;NO;NO;NO;NO;NO;NO;NO;YES;YES;NO;NO;NO;NO;NO;NO;NO
 base;menu_grant_menu_access;+++;Menu Items;NO;NO;NO;NO;NO;NO;NO;NO;NO;YES;YES;NO;NO;NO;NO;NO;NO;NO

=== 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-08-03 15:16:40 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2017-10-02 12:34:11 +0000
@@ -1,18 +1,15 @@
 id,active,applies_to_type,arguments,domain,destination_name,type_id,remote_call,model_id,name,sequence_number,status
 msf_sync_data_server.resourcing_lines,TRUE,TRUE,"['sync_order_line_db_id', 'partner_id', 'resource_ok', 'resource_sync_line_db_id', 'partner_type']","[('partner_type','!=','external'), ('partner_id', '!=', False)]",partner_id,MISSION,sale.order.line.cancel.create_line,sale.order.line.cancel,Resourcing lines,1,Valid
-msf_sync_data_server.po_creates_fo,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'sourced_references', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/is_line_split','order_line/date_planned', 'order_line/stock_take_date']","['&','&','&',('partner_type','!=','external'),('state','in',['confirmed']), ('split_po','!=','True'),('push_fo','!=','True')]",partner_id,MISSION,sale.order.create_so,purchase.order,PO creates FO,2,Valid
-msf_sync_data_server.split_po_lines_from_splitted_fo_lines,TRUE,TRUE,"['partner_id','old_sync_order_line_db_id','new_sync_order_line_db_id','new_line_qty','old_line_qty']","[]",partner_id,MISSION,purchase.order.line.to.split.create_from_sync_message,sync.sale.order.line.split,Split PO lines from splitted FO lines,3,Valid
-msf_sync_data_server.validated_fo_updates_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id', 'original_so_id_sale_order','categ', 'order_type', 'priority', 'loan_duration','delivery_confirmed_date','est_transport_lead_time', 'transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/date_planned','order_line/is_line_split', 'order_line/confirmed_delivery_date', 'order_line/cancel_split_ok', 'order_line/stock_take_date']","['&','&','&',('partner_type','!=','external'),('state','in',['validated', 'done']),('original_so_id_sale_order','=',''), ('client_order_ref','!=',False)]",partner_id,MISSION,purchase.order.validated_fo_update_original_po,sale.order,Validated FO updates  PO,4,Valid
-msf_sync_data_server.normal_fo_creates_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id','parent_order_name','delivery_confirmed_date','est_transport_lead_time', 'categ', 'order_type', 'priority', 'loan_duration','transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/date_planned', 'order_line/confirmed_delivery_date', 'order_line/stock_take_date']","['&','&','&',('partner_type','!=','external'),('state','in',['validated','done']),('client_order_ref','=',False),('split_type_sale_order','=','original_sale_order')]",partner_id,MISSION,purchase.order.normal_fo_create_po,sale.order,Normal FO creates PO,5,Valid
-msf_sync_data_server.split_fo_creates_split_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id', 'delivery_confirmed_date','categ', 'order_type', 'priority', 'loan_duration','est_transport_lead_time', 'transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/is_line_split','order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/date_planned', 'order_line/confirmed_delivery_date', 'order_line/source_sync_line_id', 'order_line/stock_take_date']","['&',('partner_type','!=','external'),('original_so_id_sale_order','!=','False')]",partner_id,MISSION,purchase.order.create_split_po,sale.order,Split FO creates Split PO,6,Valid
-msf_sync_data_server.split_fo_updates_split_po,TRUE,TRUE,"['name', 'state', 'client_order_ref','sync_date','analytic_distribution_id/id','categ', 'order_type', 'priority', 'loan_duration', 'delivery_confirmed_date','est_transport_lead_time', 'transport_type', 'note','original_so_id_sale_order', 'ready_to_ship_date', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/is_line_split','order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code', 'order_line/confirmed_delivery_date', 'order_line/source_sync_line_id', 'order_line/sync_sourced_origin', 'order_line/stock_take_date']","['&','&',('partner_type','!=','external'),('state','in',['manual','progress','shipping_except','invoice_except','done']),('original_so_id_sale_order','!=','False')]",partner_id,MISSION,purchase.order.update_split_po,sale.order,Split FO updates split PO,7,Valid
+msf_sync_data_server.po_creates_fo,TRUE,TRUE,"['name', 'analytic_distribution_id/id', 'delivery_requested_date','details','notes', 'origin', 'categ', 'order_type', 'priority', 'loan_duration', 'is_a_counterpart', 'sourced_references', 'stock_take_date']","['&','&','&',('partner_type','not in',['external','esc']),('state','in',['validated']), ('split_po','!=','True'),('push_fo','!=','True')]",partner_id,MISSION,sale.order.create_so,purchase.order,PO creates FO,2,Valid
+msf_sync_data_server.normal_fo_creates_po,TRUE,TRUE,"['name','state','analytic_distribution_id/id','parent_order_name','delivery_confirmed_date','est_transport_lead_time', 'categ', 'order_type', 'priority', 'loan_duration','transport_type', 'ready_to_ship_date', 'details', 'note','client_order_ref', 'stock_take_date', 'order_line/product_id/id', 'order_line/product_id/name','order_line/id', 'order_line/name', 'order_line/product_uom_qty', 'order_line/product_uom', 'order_line/price_unit', 'order_line/analytic_distribution_id/id','order_line/comment','order_line/have_analytic_distribution_from_header','order_line/line_number', 'order_line/nomen_manda_0/id','order_line/nomen_manda_1/id','order_line/nomen_manda_2/id','order_line/nomen_manda_3/id', 'order_line/sync_order_line_db_id', 'order_line/nomenclature_description','order_line/notes','order_line/default_name','order_line/default_code','order_line/date_planned', 'order_line/confirmed_delivery_date', 'order_line/stock_take_date']","[('partner_type','!=','external'),('state','not in',['draft']),('client_order_ref','=',False)]",partner_id,MISSION,purchase.order.normal_fo_create_po,sale.order,Normal FO creates PO,5,Valid
 msf_sync_data_server.po_updates_so_ref,TRUE,TRUE,"['name','state','partner_ref']","['&','&','&',('partner_type','!=','external'),('state','in',['confirmed','sourced','split', 'approved']),('partner_ref','!=',False),'!',('partner_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,sale.order.update_sub_so_ref,purchase.order,PO updates SO ref,8,Valid
 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.canceled_fo_cancels_po,TRUE,TRUE,"['name','state', 'client_order_ref']","[('state', '=', 'cancel'), ('client_order_ref', '!=', '')]",partner_id,MISSION,purchase.order.canceled_fo_cancel_po,sale.order,Canceled FO cancels PO,18,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.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', 'fake_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
+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
 msf_sync_data_server.cancel_out_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'standard'),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled OUT at Coordo cancels IN at Project,22,Valid
 msf_sync_data_server.cancel_pick_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'picking'),('backorder_id', '=', False),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,23,Valid
 msf_sync_data_server.cancel_stock_move_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'date_cancel']","['&','&','&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('picking_id.state', '=', 'done'),('picking_id.do_not_sync', '=', False),('to_be_sent', '=', True), '&', '|', ('picking_id.subtype', '=', 'picking'), ('picking_id.subtype', '=', 'standard'), ('picking_id.already_shipped', '=', False)]",partner_id,MISSION,stock.picking.cancel_stock_move_of_pick_cancel_in,stock.move,Canceled stock move cancels IN,24,Valid

=== modified file 'bin/addons/order_types/__openerp__.py'
--- bin/addons/order_types/__openerp__.py	2012-06-13 15:32:42 +0000
+++ bin/addons/order_types/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -30,7 +30,6 @@
                 "stock",
                 "product_expiry",
                 "purchase_double_validation",
-                "sale_override",
                 "purchase_override"],
     "author": "TeMPO Consulting, MSF",
     "website": "",

=== modified file 'bin/addons/procurement_request/__openerp__.py'
--- bin/addons/procurement_request/__openerp__.py	2013-09-16 06:13:17 +0000
+++ bin/addons/procurement_request/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF 
+#    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
@@ -22,16 +22,15 @@
 {
     "name": "Internal Request",
     "version": "1.0",
-    "depends": ["base", 
-                "sale", 
-                "sale_override", 
-                "stock_override", 
-                "msf_order_date", 
+    "depends": ["base",
+                "sale",
+                "stock_override",
+                "msf_order_date",
                 "stock",
                 "threshold_value",
                 "procurement_cycle",
                 "procurement_auto",
-		],
+                ],
     "author": "TeMPO Consulting, MSF",
     "website": "",
     "category": "Sales & Purchases",
@@ -44,7 +43,6 @@
     'update_xml': [
         'procurement_request_view.xml',
         'procurement_request_sequence.xml',
-        'procurement_request_workflow.xml',
         'procurement_request_wizard.xml',
         'procurement_request_report.xml',
         'wizard/wizard_import_list_view.xml',
@@ -59,7 +57,7 @@
     ],
     'installable': True,
     'active': False,
-#    'certificate': 'certificate',
+    #    'certificate': 'certificate',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2017-08-25 15:37:51 +0000
+++ bin/addons/procurement_request/procurement_request.py	2017-10-02 12:34:11 +0000
@@ -25,7 +25,6 @@
 from tools.translate import _
 import decimal_precision as dp
 
-from sale_override import SALE_ORDER_STATE_SELECTION
 from msf_order_date.order_dates import compute_rts
 
 
@@ -353,7 +352,6 @@
             'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty', 'type'], 10),
         },
             multi='by_type', help="The amount of lines sourced from stock"),
-        'state': fields.selection(SALE_ORDER_STATE_SELECTION, 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
         'name': fields.char('Order Reference', size=64, required=True, readonly=True, select=True),
         'is_ir_from_po_cancel': fields.boolean('Is IR from a PO cancelled', invisible=True),  # UFTP-82: flagging we are in an IR and its PO is cancelled
     }
@@ -568,59 +566,6 @@
 
         return True
 
-    def confirm_procurement(self, cr, uid, ids, context=None):
-        '''
-        Confirmed the request
-        '''
-        if context is None:
-            context = {}
-
-        self.write(cr, uid, ids, {'state': 'progress'}, context=context)
-
-        for request in self.browse(cr, uid, ids, context=context):
-            if len(request.order_line) <= 0:
-                raise osv.except_osv(_('Error'), _('You cannot confirm an Internal request with no lines !'))
-            for line in request.order_line:
-                # for FO
-                if line.type == 'make_to_order' and not line.po_cft == 'cft':
-                    if not line.supplier:
-                        line_number = line.line_number
-                        request_name = request.name
-                        raise osv.except_osv(_('Error'), _('Please correct the line %s of the %s: the supplier is required for the procurement method "On Order" !') % (line_number, request_name))
-                    # an Internal Request without product can only have Internal, Intersection or Intermission partners.
-                    elif line.supplier and not line.product_id and line.order_id.procurement_request and line.supplier.partner_type not in ['internal', 'section', 'intermission', 'esc']:
-                        raise osv.except_osv(_('Warning'), _("""For an Internal Request with a procurement method 'On Order' and without product,
-                        the supplier must be either in 'Internal', 'Inter-Section', 'Intermission' or 'ESC' type.
-                        """))
-            message = _("The internal request '%s' has been confirmed (nb lines: %s).") % (request.name, len(request.order_line))
-            proc_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'procurement_request', 'procurement_request_form_view')
-            context.update({'view_id': proc_view and proc_view[1] or False})
-            self.log(cr, uid, request.id, message, context=context)
-
-        self.action_ship_create(cr, uid, ids, context=context)
-
-        return True
-
-    def test_state_done(self, cr, uid, ids, mode, *args):
-        if not self.test_state(cr, uid, ids, mode, *args):
-            return False
-
-        for ir in self.browse(cr, uid, ids):
-            is_out = ir.location_requestor_id.usage == 'customer'
-            if not is_out:
-                return True
-
-            ir_lines = [x.id for x in ir.order_line]
-            out_move_ids = self.pool.get('stock.move').search(cr, uid, [
-                ('picking_id.type', '=', 'out'),
-                ('sale_line_id', 'in', ir_lines),
-                ('state', 'not in', ['done', 'cancel']),
-            ])
-            if out_move_ids:
-                return False
-
-        return True
-
     def procurement_done(self, cr, uid, ids, context=None):
         '''
         Creates all procurement orders according to lines
@@ -675,27 +620,6 @@
     _name = 'sale.order.line'
     _inherit = 'sale.order.line'
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        '''
-        Override the method to return 0.0 if the line is a procurement request line
-        '''
-        res = {}
-        new_ids = []
-        cur_obj = self.pool.get('res.currency')
-        curr_browse = self.pool.get('res.users').browse(cr, uid, [uid], context)[0].company_id.currency_id
-        for line in self.browse(cr, uid, ids):
-            if line.order_id.procurement_request:
-                subtotal = line.cost_price * line.product_uom_qty
-                res[line.id] = cur_obj.round(cr, uid, curr_browse.rounding, subtotal)
-                if line.cost_price > 0 and res[line.id] < 0.01:
-                    res[line.id] = 0.01
-            else:
-                new_ids.append(line.id)
-
-        res.update(super(procurement_request_line, self)._amount_line(cr, uid, new_ids, field_name, arg, context=context))
-
-        return res
-
     def create(self, cr, uid, vals, context=None):
         '''
         Adds the date_planned value.
@@ -764,7 +688,6 @@
         'cost_price': fields.float(string='Cost price', digits_compute=dp.get_precision('Sale Price Computation')),
         'procurement_request': fields.boolean(string='Internal Request', readonly=True),
         'latest': fields.char(size=64, string='Latest documents', readonly=True),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price')),
         'my_company_id': fields.many2one('res.company', 'Company', select=1),
         'supplier': fields.many2one('res.partner', 'Supplier', domain="[('id', '!=', my_company_id)]"),
         # openerp bug: eval invisible in p.o use the po line state and not the po state !
@@ -831,8 +754,14 @@
             res, test = product_obj._on_change_restriction_error(cr, uid, product_id, field_name='product_id', values={'value': vals['value']}, vals={'constraints': 'consumption'}, context=context)
             if test:
                 return res
-            vals['value'] = {'product_uom': product.uom_id.id, 'name': '[%s] %s' % (product.default_code, product.name),
-                             'type': product.procure_method, 'comment_ok': True, 'cost_price': product.standard_price, }
+            vals['value'] = {
+                'product_uom': product.uom_id.id,
+                'name': '[%s] %s' % (product.default_code, product.name),
+                'type': product.procure_method,
+                'comment_ok': True,
+                'cost_price': product.standard_price,
+                'price_unit': product.list_price,
+            }
             if vals['value']['type'] != 'make_to_stock':
                 vals['value'].update({'supplier': product.seller_ids and product.seller_ids[0].name.id})
             uom_val = uom_obj.read(cr, uid, [product.uom_id.id], ['category_id'])
@@ -892,42 +821,5 @@
 
 procurement_request_line()
 
-class purchase_order(osv.osv):
-    _name = 'purchase.order'
-    _inherit = 'purchase.order'
-
-    def _hook_action_picking_create_modify_out_source_loc_check(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        Please copy this to your module's method also.
-        This hook belongs to the action_picking_create method from purchase>purchase.py>purchase_order class
-
-        - allow to choose whether or not the source location of the corresponding outgoing stock move should
-        match the destination location of incoming stock move
-        '''
-        order_line = kwargs['order_line']
-        move_id = kwargs['move_id']
-        proc_obj = self.pool.get('procurement.order')
-        move_obj = self.pool.get('stock.move')
-        sale_line_obj = self.pool.get('sale.order.line')
-        po_line_obj = self.pool.get('purchase.order.line')
-        # If the line comes from an ISR and it's not splitted line,
-        # change the move_dest_id of this line (and their children)
-        # to match with the procurement ordre move destination
-        if order_line.move_dest_id and not order_line.is_line_split:  # UTP-972: Use the boolean for split line
-            proc_ids = proc_obj.search(cr, uid, [('move_id', '=', order_line.move_dest_id.id)], context=context)
-            so_line_ids = sale_line_obj.search(cr, uid, [('procurement_id', 'in', proc_ids)], context=context)
-            po_line_ids = po_line_obj.search(cr, uid, [('move_dest_id', '=', order_line.move_dest_id.id)], context=context)
-            if so_line_ids and all(not line.order_id or (line.order_id.procurement_request and line.order_id.location_requestor_id.usage != 'customer') for line in sale_line_obj.browse(cr, uid, so_line_ids, context=context)):
-                for proc in proc_obj.browse(cr, uid, proc_ids, context=context):
-                    if proc.move_id:
-                        move_obj.write(cr, uid, [proc.move_id.id], {'state': 'draft'}, context=context)
-                        move_obj.unlink(cr, uid, [proc.move_id.id], context=context)
-                    proc_obj.write(cr, uid, [proc.id], {'move_id': move_id}, context=context)
-                    # Update the move_dest_id of all children to avoid the system to deal with a deleted stock move
-                    po_line_obj.write(cr, uid, po_line_ids, {'move_dest_id': move_id}, context=context)
-
-        return super(purchase_order, self)._hook_action_picking_create_modify_out_source_loc_check(cr, uid, ids, context, *args, **kwargs)
-
-purchase_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2017-09-06 10:03:46 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2017-10-02 12:34:11 +0000
@@ -38,7 +38,7 @@
             <field name="priority" eval="250" />
             <field name="arch" type="xml">
                 <form string="Internal Request">
-                    <group colspan="6" attrs="{'invisible': [('state', '!=', 'validated')]}">
+                    <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;">
                                WARNING: This document has already been validated, are you sure you wish to modify after validation?
@@ -47,12 +47,12 @@
                     </group>
                     <group col="6" colspan="4" name="header">
                         <field name="name" />
-                        <field name="date_order" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
-                        <field name="warehouse_id" widget="selection"  attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
-                        <field name="requestor" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
-                        <field name="location_requestor_id" required="1" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
-                        <field name="delivery_requested_date" required="1" string="Requested date" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
-                        <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
+                        <field name="date_order" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" />
+                        <field name="warehouse_id" widget="selection"  attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" />
+                        <field name="requestor" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" />
+                        <field name="location_requestor_id" required="1" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" />
+                        <field name="delivery_requested_date" required="1" string="Requested date" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" />
+                        <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" />
                         <field name="functional_currency_id" />
                         <field name="categ" on_change="onchange_categ(categ)" />
                         <group colspan="2" col="3">
@@ -66,7 +66,7 @@
                     <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')]}" />
-                            <field name="order_line" mode="tree,form" colspan="4" nolabel="1" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}">
+                            <field name="order_line" mode="tree,form" colspan="4" nolabel="1" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}">
                                 <tree string="Products" editable="top" >
                                     <field name="product_id" on_change="requested_product_id_change(product_id, comment, parent.categ)" 
                                     context="available_for_restriction='consumption',search_default_not_restricted=1"
@@ -87,14 +87,15 @@
                                     <button name="open_order_line_to_correct" 
                                     string="Configurator" 
                                     type="object" 
-                                    attrs="{'invisible': ['|', ('product_id_ok', '=', True), ('state', 'not in', ['draft', 'validated'])]}"
+                                    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="cost_price" string="Cost Price (FC)" />
+                                    <field name="price_unit"/>
                                     <field name="notes" />
+                                    <field name="display_resourced_orig_line" />
                                     <field name="display_confirm_button" invisible="1" />
                                     <field name="type" on_change="requested_type_change(product_id, type)"
-                                           attrs="{'readonly': [('fake_state', 'not in', ['draft', 'validated']), ('display_confirm_button', '=', False)]}"
+                                           attrs="{'readonly': [('fake_state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p']), ('display_confirm_button', '=', False)]}"
                                     />
                                     <field name="my_company_id" invisible="1" />
                                     <!-- utp-357: the supplier will be selected in the sourcing tool -->
@@ -103,15 +104,17 @@
                                         attrs="{'readonly': [('type', '=', 'make_to_stock')]}"
                                         domain="[('supplier', '=', True), ('id', '!=', my_company_id), ('check_partner_ir', '=', True)]"
                                         />
-                                    <field name="fake_state" invisible="1" />
+                                    <field name="fake_state" invisible="1"/>
+                                    <field name="state_to_display"/>
                                     <field name="stock_take_date"/>
                                     <field name="price_subtotal" sum="Total"/>
                                     <button name="open_split_wizard"
                                         type="object"
                                         string="Split Line"
                                         icon="terp-stock_effects-object-colorize"
-                                        attrs="{'invisible': [('fake_state', 'in', ('confirmed', 'cancel', 'done', 'exception'))]}"
+                                        attrs="{'invisible': [('fake_state', 'in', ('confirmed', 'cancel', 'cancel_r', 'done', 'exception'))]}"
                                         />
+                                    <button string="Validate" icon="terp-check" name="validated" type="workflow" attrs="{'invisible': [('fake_state', '!=', 'draft')]}"/>
                                 </tree>
                                 <form>
                                    <field name="product_id" colspan="4" />
@@ -126,9 +129,8 @@
                             </field>
                             <group colspan="4" col="6">
                                 <field name="state" />
-                                <button name="procurement_cancel" icon="gtk-cancel" string="Cancel" states="draft,validated" context="{'noraise': True}" />
-                                <button name="procurement_validate" icon="terp-check" string="Validate" states="draft" />
-                                <button name="procurement_confirm" icon="gtk-execute" string="Confirm" states="validated" confirm="You are about to confirm the Internal Request without going through the sourcing tool. Are you sure?" />
+                                <button name="procurement_cancel" icon="gtk-cancel" string="Cancel" states="draft,draft_p,validated,validated_p" context="{'noraise': True}" />
+                                <button name="validate_lines" type="object" string="Validate Lines" icon="terp-check" states="draft,draft_p" attrs="{'readonly': [('no_line', '=', True)]}" />
                             </group>
                         </page>
                         <page string="Sourcing Documents">

=== removed file 'bin/addons/procurement_request/procurement_request_workflow.xml'
--- bin/addons/procurement_request/procurement_request_workflow.xml	2015-11-10 13:23:06 +0000
+++ bin/addons/procurement_request/procurement_request_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-    <data>
-    
-        <record id="sale.act_draft" model="workflow.activity">
-            <field name="flow_start" eval="True" />
-            <field name="kind">dummy</field>
-        </record>
-        
-        <record id="act_procurement" model="workflow.activity">
-            <field name="wkf_id" ref="sale.wkf_sale"/>
-            <field name="flow_start" eval="False" />
-            <field name="kind">dummy</field>
-            <field name="name">procurement</field>
-        </record>
-
-        <record id="act_proc_validate" model="workflow.activity">
-            <field name="wkf_id" ref="sale.wkf_sale" />
-            <field name="name">procurement_validate</field>
-            <field name="kind">function</field>
-            <field name="action">validate_procurement()</field>
-        </record>
-        <record id="act_proc_confirm" model="workflow.activity">
-            <field name="wkf_id" ref="sale.wkf_sale" />
-            <field name="name">procurement_confirm</field>
-            <field name="kind">function</field>
-            <field name="action">confirm_procurement()</field>
-        </record>
-        <record id="act_proc_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="sale.wkf_sale" />
-            <field name="name">procurement_cancel</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">function</field>
-            <field name="action">wkf_action_cancel()</field>
-        </record>
-        <record id="act_proc_done" model="workflow.activity">
-            <field name="wkf_id" ref="sale.wkf_sale" />
-            <field name="flow_stop">True</field>
-            <field name="name">procurement_done</field>
-            <field name="kind">function</field>
-            <field name="action">procurement_done()</field>
-        </record>
-        
-        <record id="trans_proc_draft" model="workflow.transition">
-            <field name="act_from" ref="sale.act_draft"/>
-            <field name="act_to" ref="act_procurement"/>
-            <field name="condition">procurement_request==True</field>
-        </record>
-
-        <record id="trans_proc_validate" model="workflow.transition">
-            <field name="act_from" ref="act_procurement"/>
-            <field name="act_to" ref="act_proc_validate"/>
-            <field name="condition">procurement_request==True</field>
-            <field name="signal">procurement_validate</field>
-        </record>
-        <record id="trans_proc_validate_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_proc_validate"/>
-            <field name="act_to" ref="act_proc_confirm"/>
-            <field name="condition">procurement_request==True</field>
-            <field name="signal">procurement_confirm</field>
-        </record>
-        <record id="trans_validate_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_proc_validate"/>
-            <field name="act_to" ref="act_proc_cancel"/>
-            <field name="signal">procurement_cancel</field>
-        </record>
-        <record id="trans_procurement_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_procurement"/>
-            <field name="act_to" ref="act_proc_cancel"/>
-            <field name="signal">procurement_cancel</field>
-        </record>
-        <record id="trans_confirm_proc_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_proc_confirm"/>
-            <field name="act_to" ref="act_proc_cancel"/>
-            <field name="signal">procurement_cancel</field>
-        </record>
-        <record id="trans_confirm_proc_done" model="workflow.transition">
-            <field name="act_from" ref="act_proc_confirm"/>
-            <field name="act_to" ref="act_proc_done"/>
-            <field name="trigger_model">procurement.order</field>
-            <field name="trigger_expr_id">procurement_lines_get()</field>
-            <field name="condition"> test_state_done('finished')</field>
-        </record>
-    
-    </data>
-</openerp>

=== modified file 'bin/addons/purchase/__init__.py'
--- bin/addons/purchase/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/purchase/__init__.py	2017-10-02 12:34:11 +0000
@@ -20,12 +20,14 @@
 ##############################################################################
 
 import purchase
+import purchase_line
+import purchase_workflow
 import partner
 import stock
 import wizard
 import report
 import stock
 import company
-
+import procurement_order
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'bin/addons/purchase/__openerp__.py'
--- bin/addons/purchase/__openerp__.py	2012-05-25 13:29:26 +0000
+++ bin/addons/purchase/__openerp__.py	2017-10-02 12:34:11 +0000
@@ -39,13 +39,13 @@
     'data': [
         'security/purchase_security.xml',
         'security/ir.model.access.csv',
-        'purchase_workflow.xml',
         'purchase_sequence.xml',
         'company_view.xml',
         'purchase_data.xml',
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_installer.xml',
         'wizard/purchase_line_invoice_view.xml',
+        'wizard/purchase_line_cancel_view.xml',
         'purchase_report.xml',
         'purchase_view.xml',
         'stock_view.xml',
@@ -53,9 +53,10 @@
         #'process/purchase_process.xml',
         'report/purchase_report_view.xml',
         'board_purchase_view.xml',
+        'purchase_line_workflow.xml',
     ],
     'test': [
-             'test/purchase_from_order.yml',
+        'test/purchase_from_order.yml',
              'test/purchase_from_manual.yml',
              'test/purchase_from_picking.yml',
              'purchase_unit_test.xml',

=== modified file 'bin/addons/purchase/process/purchase_process.xml'
--- bin/addons/purchase/process/purchase_process.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/purchase/process/purchase_process.xml	2017-10-02 12:34:11 +0000
@@ -157,7 +157,7 @@
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
         </record>
-
+        <!--
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
@@ -166,6 +166,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
         </record>
+        -->
 
         <record id="process_transition_confirmingpurchaseorder1" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>

=== added file 'bin/addons/purchase/procurement_order.py'
--- bin/addons/purchase/procurement_order.py	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase/procurement_order.py	2017-10-02 12:34:11 +0000
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from osv import osv, fields
+
+
+class procurement_order(osv.osv):
+    _inherit = 'procurement.order'
+    _columns = {
+        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+    }
+
+    def action_po_assign(self, cr, uid, ids, context=None):
+        """ This is action which call from workflow to assign purchase order to procurements
+        @return: True
+        """
+        res = self.make_po(cr, uid, ids, context=context)
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
+
+    def get_partner_hook(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        return a dictionary with partner, seller_qty and seller_delay
+        '''
+        result = {}
+
+        procurement = kwargs['procurement']
+        partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
+        seller_qty = procurement.product_id.seller_qty
+        seller_delay = int(procurement.product_id.seller_delay)
+
+        result.update(partner=partner,
+                      seller_qty=seller_qty,
+                      seller_delay=seller_delay)
+
+        return result
+
+    def po_line_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the make_po method from purchase>purchase.py>procurement_order
+
+        - allow to modify the data for purchase order line creation
+        '''
+        line = kwargs['line']
+        return line
+
+    def po_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the make_po method from purchase>purchase.py>procurement_order
+
+        - allow to modify the data for purchase order creation
+        '''
+        values = kwargs['values']
+        return values
+
+    def create_po_hook(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        creation of purchase order
+        return the id of newly created po
+        '''
+        po_obj = self.pool.get('purchase.order')
+        values = kwargs['values']
+        purchase_id = po_obj.create(cr, uid, values, context=context)
+        return purchase_id
+
+    def make_po(self, cr, uid, ids, context=None):
+        """ Make purchase order from procurement
+        @return: New created Purchase Orders procurement wise
+        """
+        res = {}
+        if context is None:
+            context = {}
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        partner_obj = self.pool.get('res.partner')
+        uom_obj = self.pool.get('product.uom')
+        pricelist_obj = self.pool.get('product.pricelist')
+        prod_obj = self.pool.get('product.product')
+        acc_pos_obj = self.pool.get('account.fiscal.position')
+        for procurement in self.browse(cr, uid, ids, context=context):
+            res_id = procurement.move_id.id
+
+            # partner, seller_qty and seller_delay are computed with hook
+            hook = self.get_partner_hook(cr, uid, ids, context=context, procurement=procurement)
+            partner = hook['partner']
+            seller_qty = hook['seller_qty']
+            seller_delay = hook['seller_delay']
+            partner_id = partner.id
+            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
+            pricelist_id = partner.property_product_pricelist_purchase
+
+            uom_id = procurement.product_id.uom_po_id.id
+
+            qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
+            if seller_qty:
+                qty = max(qty,seller_qty)
+
+            price = pricelist_obj.price_get(cr, uid, [pricelist_id.id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id.id]
+            if hook.get('price_unit', False):
+                price = hook.get('price_unit', False)            
+
+            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
+            newdate = (newdate - relativedelta(days=int(company.po_lead))) - relativedelta(days=int(seller_delay))
+
+            #Passing partner_id to context for purchase order line integrity of Line name
+            context.update({'lang': partner.lang, 'partner_id': partner_id})
+
+            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+
+            line = {
+                'name': product.partner_ref,
+                'product_qty': qty,
+                'product_id': procurement.product_id.id,
+                'product_uom': uom_id,
+                'price_unit': price,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'move_dest_id': res_id,
+                'notes': product.description_purchase,
+            }
+
+            # line values modification from hook
+            line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement, pricelist=pricelist_id)
+
+            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
+            line.update({
+                'taxes_id': [(6,0,taxes)]
+            })
+            values = {
+                'origin': procurement.origin,
+                'partner_id': partner_id,
+                'partner_address_id': address_id,
+                'location_id': procurement.location_id.id,
+                'pricelist_id': pricelist_id.id,
+                'order_line': [(0,0,line)],
+                'company_id': procurement.company_id.id,
+                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
+            }
+            # values modification from hook
+            values = self.po_values_hook(cr, uid, ids, context=context, values=values, procurement=procurement, line=line,)
+            # purchase creation from hook
+            purchase_id = self.create_po_hook(cr, uid, ids, context=context, values=values, procurement=procurement)
+            res[procurement.id] = purchase_id
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
+        return res
+
+procurement_order()
+
+

=== modified file 'bin/addons/purchase/purchase.py'
--- bin/addons/purchase/purchase.py	2017-08-03 15:16:40 +0000
+++ bin/addons/purchase/purchase.py	2017-10-02 12:34:11 +0000
@@ -20,28 +20,38 @@
 ##############################################################################
 
 import time
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
-
 from osv import osv, fields
 import netsvc
-import pooler
 from tools.translate import _
 import decimal_precision as dp
 from osv.orm import browse_record, browse_null
-
-#
-# Model definition
-#
+from order_types import ORDER_PRIORITY, ORDER_CATEGORY
+import logging
+import pooler
+import json
+import threading
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from workflow.wkf_expr import _eval_expr
+from purchase_override import PURCHASE_ORDER_STATE_SELECTION
+from account_override.period import get_period_from_date
+from account_override.period import get_date_in_period
+
+ORDER_TYPES_SELECTION = [
+    ('regular', _('Regular')),
+    ('donation_exp', _('Donation before expiry')),
+    ('donation_st', _('Standard donation')),
+    ('loan', _('Loan')),
+    ('in_kind', _('In Kind Donation')),
+    ('purchase_list', _('Purchase List')),
+    ('direct', _('Direct Purchase Order')),
+]
+
+
 class purchase_order(osv.osv):
-
-    def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res = {}
-        for order in self.browse(cr, uid, ids):
-            res[order.id] = 0
-            for oline in order.order_line:
-                res[order.id] += oline.price_unit * oline.product_qty
-        return res
+    _name = "purchase.order"
+    _description = "Purchase Order"
+    _order = "name desc"
 
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
@@ -91,19 +101,41 @@
                 res[purchase.id]=min_date
         return res
 
-
     def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
         res = {}
+        sp_obj = self.pool.get('stock.picking')
+        inv_obj = self.pool.get('account.invoice')
         for purchase in self.browse(cursor, user, ids, context=context):
-            tot = 0.0
-            for invoice in purchase.invoice_ids:
-                if invoice.state not in ('draft','cancel'):
-                    tot += invoice.amount_untaxed
-
-            if purchase.amount_untaxed:
-                res[purchase.id] = min(100.0, tot * 100.0 / (purchase.amount_untaxed))
+            if ((purchase.order_type == 'regular' and purchase.partner_id.partner_type in ('internal', 'esc')) or \
+                    purchase.order_type in ['donation_exp', 'donation_st', 'loan', 'in_kind']):
+                res[purchase.id] = purchase.shipped_rate
             else:
-                res[purchase.id] = 0.0
+                tot = 0.0
+                # UTP-808: Deleted invoices amount should be taken in this process. So what we do:
+                # 1/ Take all closed stock picking linked to the purchase
+                # 2/ Search invoices linked to these stock picking
+                # 3/ Take stock picking not linked to an invoice
+                # 4/ Use these non-invoiced closed stock picking to add their amount to the "invoiced" amount
+                for invoice in purchase.invoice_ids:
+                    if invoice.state not in ('draft','cancel'):
+                        tot += invoice.amount_untaxed
+                stock_pickings = sp_obj.search(cursor, user, [('purchase_id', '=', purchase.id), ('state', '=', 'done')])
+                if stock_pickings:
+                    sp_ids = list(stock_pickings)
+                    if isinstance(stock_pickings, (int, long)):
+                        stock_pickings = [stock_pickings]
+                    for sp in stock_pickings:
+                        inv_ids = inv_obj.search_exist(cursor, user, [('picking_id', '=', sp)])
+                        if inv_ids:
+                            sp_ids.remove(sp)
+                    if sp_ids:
+                        for stock_picking in sp_obj.browse(cursor, user, sp_ids):
+                            for line in stock_picking.move_lines:
+                                tot += line.product_qty * line.price_unit
+                if purchase.amount_untaxed:
+                    res[purchase.id] = min(100.0, tot * 100.0 / (purchase.amount_untaxed))
+                else:
+                    res[purchase.id] = 0.0
         return res
 
     def _shipped_rate(self, cr, uid, ids, name, arg, context=None):
@@ -140,61 +172,399 @@
             result[line.order_id.id] = True
         return result.keys()
 
+    def _get_allocation_setup(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Returns the Unifield configuration value
+        '''
+        res = {}
+        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+
+        for order in ids:
+            res[order] = setup.allocation_setup
+
+        return res
+
+    def _get_no_line(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Compute the number of Purchase order lines in each purchase order.
+        A split line is count as one line
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of purchase.order ID to compute
+        :param field_name: Name of the field to compute
+        :param args: Extra parameters
+        :param context: Context of the call
+        :return: A dictionnary with the purchase.order ID as keys and the number of Purchase
+                 order lines for each of them as value
+        """
+        pol_obj = self.pool.get('sale.order.line')
+
+        if context is None:
+            context =  {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+
+        for order_id in ids:
+            res[order_id] = pol_obj.search_count(cr, uid, [
+                ('order_id', '=', order_id),
+                ('is_line_split', '=', False),
+            ], context=context)
+
+        return res
+
+
+    def _po_from_x(self, cr, uid, ids, field_name, args, context=None):
+        """
+        fields.function multi for 'po_from_ir' and 'po_from_fo' fields.
+        As one PO can contains lines from IR and from FO, both fields can be True
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]    
+
+        res = {}
+        for po in self.browse(cr, uid, ids, context=context):
+            res[po.id] = {
+                'po_from_ir': False,
+                'po_from_fo': False,
+            }
+
+        return res
+
+    def _get_dest_partner_names(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        res_partner_obj = self.pool.get('res.partner')
+        for po_r in self.read(cr, uid, ids, ['dest_partner_ids'], context=context):
+            names = ''
+            if po_r['dest_partner_ids']:
+                name_tuples = res_partner_obj.name_get(cr, uid, po_r['dest_partner_ids'], context=context)
+                if name_tuples:
+                    names_list = [nt[1] for nt in name_tuples]
+                    names = "; ".join(names_list)
+            res[po_r['id']] = names
+        return res
+
+    def _get_project_ref(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Get the name of the POs at project side
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        so_obj = self.pool.get('sale.order')
+        for po in ids:
+            res[po] = {
+                'fnct_project_ref': '',
+                'sourced_references': '',
+            }
+
+            so_ids = self.get_so_ids_from_po_ids(cr, uid, po, context=context)
+            for so in so_obj.read(cr, uid, so_ids, ['client_order_ref', 'name'], context=context):
+                if so['client_order_ref']:
+                    if res[po]['fnct_project_ref']:
+                        res[po]['fnct_project_ref'] += ' - '
+                    res[po]['fnct_project_ref'] += so['client_order_ref']
+
+                if res[po]['sourced_references']:
+                    res[po]['sourced_references'] += ','
+                res[po]['sourced_references'] += so['name']
+
+        return res
+
+    def _get_vat_ok(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return True if the system configuration VAT management is set to True
+        '''
+        vat_ok = self.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok
+        res = {}
+        for id in ids:
+            res[id] = vat_ok
+
+        return res
+
+    def _get_requested_date_in_past(self, cr, uid, ids, field_name, args, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        for po in self.read(cr, uid, ids, ['delivery_requested_date', 'rfq_ok'], context=context):
+            res[po['id']] = po['delivery_requested_date'] and not po['rfq_ok'] and po['delivery_requested_date'] < time.strftime('%Y-%m-%d') or False
+
+        return res
+
+
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
-        for purchase in self.browse(cursor, user, ids, context=context):
+        for purchase in self.read(cursor, user, ids, ['invoiced_rate'], context=context):
             invoiced = False
-            if purchase.invoiced_rate == 100.00:
+            if purchase['invoiced_rate'] == 100.00:
                 invoiced = True
-            res[purchase.id] = invoiced
-        return res
-
-    STATE_SELECTION = [
-        ('draft', 'Request for Quotation'),
-        ('wait', 'Waiting'),
-        ('confirmed', 'Waiting Approval'),
-        ('approved', 'Approved'),
-        ('except_picking', 'Shipping Exception'),
-        ('except_invoice', 'Invoice Exception'),
-        ('done', 'Done'),
-        ('cancel', 'Cancelled')
-    ]
+            res[purchase['id']] = invoiced
+        return res
+
+    def _src_customer_ref(self, cr, uid, obj, name, args, context=None):
+        '''
+        return a domain when user filter on the customer_ref field
+        '''
+        if not args:
+            return []
+
+        po_ids = set()
+        for tu in args:
+            if tu[1] in ('ilike', 'not ilike', '=', '!='):
+                so_ids = self.pool.get('sale.order').search(cr, uid, [('client_order_ref', tu[1], tu[2])], context=context)
+                sol_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', 'in', so_ids)], context=context)
+                pol_ids = self.pool.get('purchase.order.line').search(cr, uid, [('linked_sol_id', 'in', sol_ids)], context=context)
+                for pol in self.pool.get('purchase.order.line').browse(cr, uid, pol_ids, context=context):
+                    po_ids.add(pol.order_id.id)
+            else:
+                raise osv.except_osv(_('Error'), _('Bad operator : You can only use \'=\', \'!=\', \'ilike\' or \'not ilike\' as operator'))
+
+        return [('id', 'in', list(po_ids))]
+
+    def _get_customer_ref(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return a concatenation of the PO's customer references from the project (case of procurement request)
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        so_obj = self.pool.get('sale.order')
+        for po_id in ids:
+            res[po_id] = ""
+
+            so_ids = self.get_so_ids_from_po_ids(cr, uid, po_id, context=context)
+            for so in so_obj.read(cr, uid, so_ids, ['client_order_ref'], context=context):
+                if so['client_order_ref']:
+                    if res[po_id]:
+                        res[po_id] += ';'
+                    res[po_id] += so['client_order_ref']
+
+        return res
+
+    def _get_line_count(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the number of line(s) for the PO
+        '''
+        pol_obj = self.pool.get('purchase.order.line')
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}.fromkeys(ids, 0)
+        line_number_by_order = {}
+
+        lines = pol_obj.search(cr, uid, [('order_id', 'in', ids)], context=context)
+        for l in pol_obj.read(cr, uid, lines, ['order_id', 'line_number'], context=context):
+            line_number_by_order.setdefault(l['order_id'][0], set())
+            line_number_by_order[l['order_id'][0]].add(l['line_number'])
+
+        for po_id, ln in line_number_by_order.iteritems():
+            res[po_id] = len(ln)
+
+        return res
+
+
+    def _get_less_advanced_pol_state(self, cr, uid, ids, field_name, arg, context=None):
+        """
+        Get the less advanced state of the purchase order lines
+        Used to compute sale order state
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        for po in self.browse(cr, uid, ids, context=context):
+            pol_states = set([line.state for line in po.order_line])
+            if all([s.startswith('cancel') for s in pol_states]): # if all lines are cancelled then the PO is cancelled
+                res[po.id] = 'cancel'
+            else: # else compute the less advanced state:
+                # cancel state must be ignored:
+                pol_states.discard('cancel')
+                pol_states.discard('cancel_r')
+                res[po.id] = self.pool.get('purchase.order.line.state').get_less_advanced_state(cr, uid, ids, pol_states, context=context)
+
+                if res[po.id] == 'draft': # set the draft-p state ?
+                    draft_sequence = self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, 'draft', context=context)
+                    # do we have a line further then draft in our FO ?
+                    if any([self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, s, context=context) > draft_sequence for s in pol_states]):
+                        res[po.id] = 'draft_p'
+                elif res[po.id] in ('validated', 'validated_n'): # set the validated-p state ?
+                    validated_sequence = self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, 'validated', context=context)
+                    # do we have a line further then validated in our FO ?
+                    if any([self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, s, context=context) > validated_sequence for s in pol_states]):
+                        res[po.id] = 'validated_p'
+                    else:
+                        res[po.id] = 'validated'
+                elif res[po.id].startswith('sourced'): # set the sourced-p state ?
+                    sourced_sequence = self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, 'sourced', context=context)
+                    # do we have a line further then sourced in our FO ?
+                    if any([self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, s, context=context) > sourced_sequence for s in pol_states]):
+                        res[po.id] = 'sourced_p'
+                    else:
+                        res[po.id] = 'sourced'
+                elif res[po.id] == 'confirmed': # set the confirmed-p state ?
+                    confirmed_sequence = self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, 'confirmed', context=context)
+                    # do we have a line further then confirmed in our FO ?
+                    if any([self.pool.get('purchase.order.line.state').get_sequence(cr, uid, ids, s, context=context) > confirmed_sequence for s in pol_states]):
+                        res[po.id] = 'confirmed_p'
+
+        return res
+
+    def _is_fixed_type(self, cr, uid, ids, field_name, args, context=None):
+        """
+        For each PO, set is the Order Type of the PO can be changed or not
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of purchase.order records to check
+        :param field_name: Name of the field to compute
+        :param args: Extra parameters
+        :param context: Context of the call
+        :return: A dictionnary with ID of the purchase.order record as keys and True/Fales as values
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if context is None:
+            context =  {}
+
+        context['procurement_request'] = True
+
+        res = {}
+        for po in self.browse(cr, uid, ids, fields_to_fetch=['po_from_fo', 'po_from_ir'], context=context):
+            if po.po_from_fo or po.po_from_ir:
+                src_type = set()
+                sale_ids = self.get_so_ids_from_po_ids(cr, uid, [po.id], context=context)
+                if sale_ids:
+                    for sale in self.pool.get('sale.order').read(cr, uid, sale_ids, ['procurement_request', 'order_type'], context=context):
+                        if sale['procurement_request'] or sale['order_type'] == 'regular':
+                            src_type.add('regular')
+                            src_type.add('purchase_list')
+
+                        if not sale['procurement_request']:
+                            if sale['order_type'] == 'regular':
+                                src_type.add('direct')
+                            elif sale['order_type'] == 'loan':
+                                src_type.add('loan')
+                            elif sale['order_type'] == 'donation_exp':
+                                src_type.add('donation_exp')
+                            elif sale['order_type'] == 'donation_st':
+                                src_type.add('donation_st')
+                res[po.id] = json.dumps(list(src_type))
+            else:
+                res[po.id] = json.dumps([x[0] for x in ORDER_TYPES_SELECTION])
+
+        return res
+
+    def _order_line_order_type(self, cr, uid, ids, context=None):
+        """
+        Return the list of ID of purchase.order records to update
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of purchase.order.line records updated
+        :param context: Context of the call
+        :return: A list that represents a domain to apply on purchase.order records
+        """
+        lines = self.read(cr, uid, ids, ['order_id'], context=context)
+        po_ids = set()
+        for l in lines:
+            po_ids.add(l['order_id'][0])
+
+        return list(po_ids)
+
 
     _columns = {
-        'name': fields.char('Order Reference', size=64, required=True, select=True, help="unique number of the purchase order,computed automatically when the purchase order is created"),
-        'origin': fields.char('Source Document', size=512,
-                              help="Reference of the document that generated this purchase order request."
-                              ),
-        'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
-        'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
+        'order_type': fields.selection(ORDER_TYPES_SELECTION, string='Order Type', required=True, states={'sourced':[('readonly',True)], 'split':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'loan_id': fields.many2one('sale.order', string='Linked loan', readonly=True),
+        'priority': fields.selection(ORDER_PRIORITY, string='Priority', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'categ': fields.selection(ORDER_CATEGORY, string='Order category', required=True, states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        # we increase the size of the 'details' field from 30 to 86
+        'details': fields.char(size=86, string='Details', states={'sourced':[('readonly',True)], 'split':[('readonly',True)], 'cancel':[('readonly',True)], 'confirmed_wait':[('readonly',True)], 'validated':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'loan_duration': fields.integer(string='Loan duration', help='Loan duration in months', states={'validated':[('readonly',True)],'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'date_order': fields.date(string='Creation Date', readonly=True, required=True,
+                                  states={'draft':[('readonly',False)],}, select=True, help="Date on which this document has been created."),
+        'name': fields.char('Order Reference', size=64, required=True, select=True, readonly=True,
+                            help="unique number of the purchase order,computed automatically when the purchase order is created"),
+        'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order", readonly=True),
+        'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft':[('readonly',False)], 'validated': [('readonly',False)]}),
+        'partner_id': fields.many2one('res.partner', 'Supplier', required=True, states={'sourced':[('readonly',True)], 'split':[('readonly',True)], 'rfq_sent':[('readonly',True)], 'rfq_done':[('readonly',True)], 'rfq_updated':[('readonly',True)], 'confirmed':[('readonly',True)], 'confirmed_wait':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)],'cancel':[('readonly',True)]}, change_default=True, domain="[('id', '!=', company_id)]"),
+        'partner_address_id': fields.many2one('res.partner.address', 'Address', required=True,
+                                              states={'sourced':[('readonly',True)], 'split':[('readonly',True)], 'rfq_sent':[('readonly',True)], 'rfq_done':[('readonly',True)], 'rfq_updated':[('readonly',True)], 'validated':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
+        'dest_partner_id': fields.many2one('res.partner', string='Destination partner'),
+        'invoice_address_id': fields.many2one('res.partner.address', string='Invoicing address', required=True,
+                                              help="The address where the invoice will be sent."),
+        'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True, readonly=True,
+                                           help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
+                                           "will just have to validate this invoice for control.\n" \
+                                           "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
+                                           "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
+                                           ),
+        'merged_line_ids': fields.one2many('purchase.order.merged.line', 'order_id', string='Merged line'),
+        'date_confirm': fields.date(string='Confirmation date'),
+        'allocation_setup': fields.function(_get_allocation_setup, type='selection',
+                                            selection=[('allocated', 'Allocated'),
+                                                       ('unallocated', 'Unallocated'),
+                                                       ('mixed', 'Mixed')], string='Allocated setup', method=True, store=False),
+        'unallocation_ok': fields.boolean(string='Unallocated PO'),
+        'partner_ref': fields.char('Supplier Reference', size=128),
+        'product_id': fields.related('order_line', 'product_id', type='many2one', relation='product.product', string='Product'),
+        'no_line': fields.function(_get_no_line, method=True, type='boolean', string='No line'),
+        'active': fields.boolean('Active', readonly=True),
+        'po_from_ir': fields.function(_po_from_x, method=True, type='boolean', string='Is PO from IR ?', multi='po_from_x'),
+        'po_from_fo': fields.function(_po_from_x, method=True, type='boolean', string='Is PO from FO ?', multi='po_from_x'),
+        'canceled_end': fields.boolean(string='Canceled End', readonly=True),
+        'is_a_counterpart': fields.boolean('Counterpart?', help="This field is only for indicating that the order is a counterpart"),
+        'po_updated_by_sync': fields.boolean('PO updated by sync', readonly=False),
+        'origin': fields.text('Source Document', help="Reference of the document that generated this purchase order request."),
+        # UF-2267: Store also the parent PO as reference in the sourced PO
+        'parent_order_name': fields.many2one('purchase.order', string='Parent PO name', help='If the PO is created from a re-source FO, this field contains the relevant original PO name'),
+        'project_ref': fields.char(size=256, string='Project Ref.'),
+        'message_esc': fields.text(string='ESC Message'),
+        'fnct_project_ref': fields.function(_get_project_ref, method=True, string='Project Ref.',
+                                            type='char', size=256, store=False, multi='so_info'),
+        'dest_partner_ids': fields.many2many('res.partner', 'res_partner_purchase_order_rel', 'purchase_order_id', 'partner_id', 'Customers'),  # uf-2223
+        'dest_partner_names': fields.function(_get_dest_partner_names, type='char', size=256,  string='Customers', method=True),  # uf-2223
+        'split_po': fields.boolean('Created by split PO', readonly=True),
+        'sourced_references': fields.function(_get_project_ref, method=True, string='Sourced references', type='text', store=False, multi='so_info'),
+        'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
+        'requested_date_in_past': fields.function(_get_requested_date_in_past, method=True, string='Requested date in past', type='boolean', store=False),
+        'update_in_progress': fields.boolean(string='Update in progress', readonly=True),
+        # US-1765: register the 1st call of wkf_confirm_trigger to prevent recursion error
+        'po_confirmed': fields.boolean('PO', readonly=True),
+        'customer_ref': fields.function(_get_customer_ref, fnct_search=_src_customer_ref, method=True, string='Customer Ref.', type='text', store=False),
+        'line_count': fields.function(_get_line_count, method=True, type='integer', string="Line count", store=False),
+
         'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
-        'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
-                                             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
         'dest_address_id':fields.many2one('res.partner.address', 'Destination Address',
-                                          states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
+                                          states={'validated':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
                                           help="Put an address if you want to deliver directly from the supplier to the customer." \
                                           "In this case, it will remove the warehouse link and set the customer location."
                                           ),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'validated':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
-        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
-        'state': fields.selection(STATE_SELECTION, 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
-        'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'validated':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
+        'state': fields.function(_get_less_advanced_pol_state, string='Order State', method=True, type='selection', selection=PURCHASE_ORDER_STATE_SELECTION, readonly=True,
+                                 store = {
+                                 'purchase.order.line': (_get_order, ['state'], 10), 
+                                 },
+                                 select=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception."
+                                 ),
+
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
-        'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
         'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
+        'invoiced': fields.function(_invoiced, method=True, string='Invoiced', type='boolean', help="It indicates that an invoice has been generated"),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
-                                           help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
-                                           "will just have to validate this invoice for control.\n" \
-                                           "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
-                                           "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
-                                           ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
                                                store = {
                                                    'purchase.order.line': (_get_order, ['date_planned'], 10),
@@ -213,37 +583,188 @@
             'purchase.order.line': (_get_order, ['price_subtotal', 'taxes_id', 'price_unit', 'product_qty', 'product_id'], 10),
         }, multi="sums",help="The total amount"),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
-        'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
         'stock_take_date': fields.date(string='Date of Stock Take', required=False),
+        'fixed_order_type': fields.function(_is_fixed_type, method=True, type='char', size=256, string='Possible order types', store={
+                'purchase.order': (lambda obj, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'purchase.order.line': (_order_line_order_type, ['order_id'], 10),
+            },
+        ),
     }
     _defaults = {
+        'po_confirmed': lambda *a: False,
+        'order_type': lambda *a: 'regular',
+        'priority': lambda *a: 'normal',
+        'categ': lambda *a: 'other',
+        'loan_duration': 2,
+        'invoice_address_id': lambda obj, cr, uid, ctx: obj.pool.get('res.partner').address_get(cr, uid, obj.pool.get('res.users').browse(cr, uid, uid, ctx).company_id.partner_id.id, ['invoice'])['invoice'],
+        'invoice_method': lambda *a: 'picking',
+        'dest_address_id': lambda obj, cr, uid, ctx: obj.pool.get('res.partner').address_get(cr, uid, obj.pool.get('res.users').browse(cr, uid, uid, ctx).company_id.partner_id.id, ['delivery'])['delivery'],
+        'no_line': lambda *a: True,
+        'active': True,
+        'name': lambda *a: False,
+        'is_a_counterpart': False,
+        'parent_order_name': False,
+        'canceled_end': False,
+        'split_po': False,
+        'vat_ok': lambda obj, cr, uid, context: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
+        'update_in_progress': False,
         'date_order': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
         'shipped': 0,
-        'invoice_method': 'order',
         'invoiced': 0,
         'partner_address_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['default'])['default'],
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
+        'fixed_order_type': lambda *a: json.dumps([]),
     }
     _sql_constraints = [
         ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
     ]
-    _name = "purchase.order"
-    _description = "Purchase Order"
-    _order = "name desc"
+
+    def _check_po_from_fo(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        for po in self.browse(cr, uid, ids, context=context):
+            if po.partner_id.partner_type == 'internal' and po.po_from_fo:
+                return False
+        return True
+
+    def _check_order_type(self, cr, uid, ids, context=None):
+        '''
+        Check the integrity of the order type and the source order type
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of sale.order to check
+        :param context: Context of the call
+        :return: True if the integrity is ok.
+        '''
+        err = []
+
+        order_types_dict = dict((x, y) for x, y in ORDER_TYPES_SELECTION)
+
+        for order in self.read(cr, uid, ids, ['name', 'fixed_order_type', 'order_type', 'is_a_counterpart'], context=context):
+            if order['is_a_counterpart'] and order['order_type'] != 'loan':
+                err.append(_('%s: This purchase order is a loan counterpart. You cannot change its order type') % order['name'])
+            else:
+                json_info = json.loads(order['fixed_order_type'])
+                if json_info and order['order_type'] not in json_info:
+                    allowed_type = ' / '.join(order_types_dict.get(x) for x in json_info)
+                    err.append(_('%s: Only %s order types are allowed for this purchase order') % (order['name'], allowed_type))
+
+        if err:
+            raise osv.except_osv(
+                _('Error'),
+                '\n'.join(x for x in err),
+            )
+
+        return True
+
+    _constraints = [
+        (_check_po_from_fo, 'You cannot choose an internal supplier for this purchase order', []),
+        (_check_order_type, 'The order type of the order is not consistent with the order type of the source', ['order_type'])
+    ]
+
+    def default_get(self, cr, uid, fields, context=None):
+        '''
+        Fill the unallocated_ok field according to Unifield setup
+        '''
+        res = super(purchase_order, self).default_get(cr, uid, fields, context=context)
+
+        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+        res.update({'unallocation_ok': False, 'allocation_setup': setup.allocation_setup})
+        if setup.allocation_setup == 'unallocated':
+            res.update({'unallocation_ok': True})
+
+        res.update({'name': False})
+
+        return res
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Filled in 'from_yml_test' to True if we come from tests
+        # UTP-114 demands purchase_list PO to be 'from picking'.
+        """
+        if not context:
+            context = {}
+
+        if vals.get('order_type'):
+            if vals.get('order_type') in ['donation_exp', 'donation_st']:
+                vals.update({'invoice_method': vals.get('partner_type', '') == 'section' and 'picking' or 'manual'})
+            elif vals.get('order_type') == 'loan':
+                vals.update({'invoice_method': 'manual'})
+            elif vals.get('order_type') in ['direct']:
+                vals.update({'invoice_method': 'order'})
+                if vals.get('partner_id'):
+                    if self.pool.get('res.partner').read(cr, uid, vals.get('partner_id'), ['partner_type'], context=context)['partner_type'] == 'esc':
+                        vals.update({'invoice_method': 'manual'})
+            else:
+                vals.update({'invoice_method': 'picking'})
+
+        if 'partner_id' in vals:
+            self._check_user_company(cr, uid, vals['partner_id'], context=context)
+        # we need to update the location_id because it is readonly and so does not pass in the vals of create and write
+        vals = self._get_location_id(cr, uid, vals, warehouse_id=vals.get('warehouse_id', False), context=context)
+        res = super(purchase_order, self).create(cr, uid, vals, context=context)
+        return res
+
+    def write(self, cr, uid, ids, vals, context=None):
+        '''
+        Check if the partner is correct.
+        # UTP-114 demand purchase_list PO to be "from picking" as invoice_method
+        '''
+        if not ids:
+            return True
+        if 'partner_id' in vals:
+            self._check_user_company(cr, uid, vals['partner_id'], context=context)
+
+
+        res_partner_obj = self.pool.get('res.partner')
+        for order in self.read(cr, uid, ids, ['partner_id', 'warehouse_id'], context=context):
+            partner_type = res_partner_obj.read(cr, uid, int(vals.get('partner_id', order['partner_id'][0])), ['partner_type'], context=context)['partner_type']
+            if vals.get('order_type'):
+                if vals.get('order_type') in ['donation_exp', 'donation_st']:
+                    vals.update({'invoice_method': partner_type == 'section' and 'picking' or 'manual'})
+                elif vals.get('order_type') == 'loan':
+                    vals.update({'invoice_method': 'manual'})
+                elif vals.get('order_type') in ['direct',] and partner_type != 'esc':
+                    vals.update({'invoice_method': 'order'})
+                elif vals.get('order_type') in ['direct',] and partner_type == 'esc':
+                    vals.update({'invoice_method': 'manual'})
+                else:
+                    vals.update({'invoice_method': 'picking'})
+            # we need to update the location_id because it is readonly and so does not pass in the vals of create and write
+            vals = self._get_location_id(cr, uid, vals,  warehouse_id=vals.get('warehouse_id', order['warehouse_id'] and order['warehouse_id'][0] or False), context=context)
+            # FIXME here it is useless to continue as the next loop will
+            # overwrite vals
+            break
+
+        # Fix bug invalid syntax for type date:
+        if 'valid_till' in vals and vals['valid_till'] == '':
+            vals['valid_till'] = False
+
+        res = super(purchase_order, self).write(cr, uid, ids, vals, context=context)
+
+        # Delete expected sale order line
+        if 'state' in vals and vals.get('state') not in ('draft', 'validated'):
+            exp_sol_ids = self.pool.get('expected.sale.order.line').search(cr,
+                                                                           uid, [('po_id', 'in', ids)], order='NO_ORDER', context=context)
+            self.pool.get('expected.sale.order.line').unlink(cr, uid, exp_sol_ids, context=context)
+
+        return res
 
     def unlink(self, cr, uid, ids, context=None):
+        if self.get_so_ids_from_po_ids(cr, uid, ids, context=context):
+            raise osv.except_osv(_('Error'), _('You cannot remove a Purchase order that is linked to a Field Order or an Internal Request. Please cancel it instead.'))
+
         purchase_orders = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for s in purchase_orders:
             if s['state'] in ['draft','cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!')  % _(dict(purchase_order.STATE_SELECTION).get(s['state'])))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!')  % _(dict(PURCHASE_ORDER_STATE_SELECTION).get(s['state'])))
 
         # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
         # automatically sending subflow.delete upon deletion
@@ -257,105 +778,45 @@
 
         return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)
 
-    def button_dummy(self, cr, uid, ids, context=None):
-        return True
-
-    def onchange_dest_address_id(self, cr, uid, ids, adr_id):
-        if not adr_id:
-            return {}
-        values = {'warehouse_id': False}
-        part_id = self.pool.get('res.partner.address').browse(cr, uid, adr_id).partner_id
-        if part_id:
-            loc_id = part_id.property_stock_customer.id
-            values.update({'location_id': loc_id})
-        return {'value':values}
-
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id):
-        if not warehouse_id:
-            return {}
-        res = self.pool.get('stock.warehouse').read(cr, uid, [warehouse_id], ['lot_input_id'])[0]['lot_input_id'][0]
-        return {'value':{'location_id': res, 'dest_address_id': False}}
-
-    def onchange_partner_id(self, cr, uid, ids, part):
-
-        if not part:
-            return {'value':{'partner_address_id': False, 'fiscal_position': False}}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
-        part = self.pool.get('res.partner').browse(cr, uid, part)
-        pricelist = part.property_product_pricelist_purchase.id
-        fiscal_position = part.property_account_position and part.property_account_position.id or False
-        return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
-
-    def wkf_approve_order(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
-        return True
-
-    def _hook_confirm_order_message(self, cr, uid, context=None, *args, **kwargs):
-        '''
-        Add a hook to modify the logged message
-        '''
-        # Some verifications
-        if context is None:
-            context = {}
-
-        return kwargs['message']
-
-    def _hook_confirm_order_update_corresponding_so(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        Please copy this to your module's method also.
-        This hook belongs to the wkf_confirm_order method from purchase>purchase.py>purchase_order
-
-        - allow to execute code in order to update corresponding sale order lines and sale orders if exist
-        '''
-        # Some verifications
-        if context is None:
-            context = {}
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-
-        return True
-
-    #UTP-872: extracted this method for a particularly check with sync
-    def _hook_check_po_no_line(self, po, context):
-        if not po.order_line:
-            raise osv.except_osv(_('Error !'), _('You can not confirm purchase order without Purchase Order Lines.'))
-
-    def wkf_confirm_order(self, cr, uid, ids, context=None):
-        todo = []
-        for po in self.browse(cr, uid, ids, context=context):
-            self._hook_check_po_no_line(po, context)
-            for line in po.order_line:
-                if line.state=='draft':
-                    todo.append(line.id)
-            message = _("Purchase order '%s' is confirmed.") % (po.name,)
-            message = self._hook_confirm_order_message(cr, uid, context=context, message=message, po=po)
-            self.log(cr, uid, po.id, message)
-            # hook for corresponding Fo update
-            self._hook_confirm_order_update_corresponding_so(cr, uid, ids, context=context, po=po)
-#        current_name = self.name_get(cr, uid, ids)[0][1]
-        self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
-        for id in ids:
-            self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
-        return True
-
-    def wkf_warn_buyer(self, cr, uid, ids):
-        self.write(cr, uid, ids, {'state' : 'wait', 'validator' : uid})
-        request = pooler.get_pool(cr.dbname).get('res.request')
-        for po in self.browse(cr, uid, ids):
-            managers = []
-            for oline in po.order_line:
-                manager = oline.product_id.product_manager
-                if manager and not (manager.id in managers):
-                    managers.append(manager.id)
-            for manager_id in managers:
-                request.create(cr, uid,{
-                    'name' : _("Purchase amount over the limit"),
-                    'act_from' : uid,
-                    'act_to' : manager_id,
-                    'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'),
-                    'ref_partner_id': po.partner_id.id,
-                    'ref_doc1': 'purchase.order,%d' % (po.id,),
-                })
+    def _hook_copy_name(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        HOOK from purchase>purchase.py for COPY function. Modification of default copy values
+        define which name value will be used
+        '''
+        return {'state':'draft',
+                'shipped':False,
+                'invoiced':False,
+                'invoice_ids': [],
+                'picking_ids': [],
+                'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
+                }
+
+
+    def copy(self, cr, uid, p_id, default=None, context=None):
+        '''
+        Remove loan_id field on new purchase.order
+        '''
+        if not default:
+            default = {}
+        if context is None:
+            context = {}
+
+        update_values = self._hook_copy_name(cr, uid, [p_id], context=context, default=default)
+        default.update(update_values)
+        # if the copy comes from the button duplicate
+        if context.get('from_button'):
+            default.update({'is_a_counterpart': False})
+        default.update({'loan_id': False, 'merged_line_ids': False, 'partner_ref': False, 'po_confirmed': False})
+        if not context.get('keepOrigin', False):
+            default.update({'origin': False})
+
+        if not 'date_confirm' in default:
+            default['date_confirm'] = False
+        if not default.get('related_sourcing_id', False):
+            default['related_sourcing_id'] = False
+
+        return super(purchase_order, self).copy(cr, uid, p_id, default, context=context)
+
     def inv_line_create(self, cr, uid, a, ol):
         return (0, False, {
             'name': ol.name,
@@ -368,20 +829,6 @@
             'account_analytic_id': ol.account_analytic_id.id or False,
         })
 
-    def action_cancel_draft(self, cr, uid, ids, *args):
-        if not len(ids):
-            return False
-        self.write(cr, uid, ids, {'state':'draft','shipped':0})
-        wf_service = netsvc.LocalService("workflow")
-        for p_id in ids:
-            # Deleting the existing instance of workflow for PO
-            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
-            wf_service.trg_create(uid, 'purchase.order', p_id, cr)
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _("Purchase order '%s' has been set in draft state.") % name
-            self.log(cr, uid, id, message)
-        return True
-
     def action_invoice_create(self, cr, uid, ids, *args):
         res = False
 
@@ -425,6 +872,15 @@
                 'payment_term': o.partner_id.property_payment_term and o.partner_id.property_payment_term.id or False,
                 'company_id': o.company_id.id,
             }
+            if o.order_type == 'purchase_list':
+                inv['purchase_list'] = 1
+            elif o.order_type == 'in_kind':
+                inkind_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'inkind'), ('is_current_instance', '=', True)])
+                if not inkind_journal_ids:
+                    raise osv.except_osv(_('Error'), _('No In-kind Donation journal found!'))
+                inv['journal_id'] = inkind_journal_ids[0]
+                inv['is_inkind_donation'] = True
+
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice', 'journal_type': 'purchase'})
             self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
             self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True})
@@ -432,120 +888,78 @@
             res = inv_id
         return res
 
-    def has_stockable_product(self,cr, uid, ids, *args):
-        for order in self.browse(cr, uid, ids):
-            for order_line in order.order_line:
-                if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                    return True
-        return False
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        for purchase in self.browse(cr, uid, ids, context=context):
-            for pick in purchase.picking_ids:
-                if pick.state not in ('draft','cancel'):
-                    raise osv.except_osv(
-                        _('Could not cancel purchase order !'),
-                        _('You must first cancel all picking attached to this purchase order.'))
-            for pick in purchase.picking_ids:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
-            for inv in purchase.invoice_ids:
-                if inv and inv.state not in ('cancel','draft'):
-                    raise osv.except_osv(
-                        _('Could not cancel this purchase order !'),
-                        _('You must first cancel all invoices attached to this purchase order.'))
-                if inv:
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
-        self.write(cr,uid,ids,{'state':'cancel'})
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _("Purchase order '%s' is cancelled.") % name
-            self.log(cr, uid, id, message)
+    def button_dummy(self, cr, uid, ids, context=None):
         return True
 
-    def action_picking_create(self,cr, uid, ids, *args):
-        picking_id = False
-        for order in self.browse(cr, uid, ids):
-            loc_id = order.partner_id.property_stock_supplier.id
-            istate = 'none'
-            if order.invoice_method=='picking':
-                istate = '2binvoiced'
-            pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in')
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                'name': pick_name,
-                'origin': order.name+((order.origin and (':'+order.origin)) or ''),
-                'type': 'in',
-                'address_id': order.dest_address_id.id or order.partner_address_id.id,
-                'invoice_state': istate,
-                'purchase_id': order.id,
-                'company_id': order.company_id.id,
-                'move_lines' : [],
-            })
-            todo_moves = []
-            for order_line in order.order_line:
-                if not order_line.product_id:
-                    continue
-                if order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                    dest = order.location_id.id
-                    move = self.pool.get('stock.move').create(cr, uid, {
-                        'name': order.name + ': ' +(order_line.name or ''),
-                        'product_id': order_line.product_id.id,
-                        'product_qty': order_line.product_qty,
-                        'product_uos_qty': order_line.product_qty,
-                        'product_uom': order_line.product_uom.id,
-                        'product_uos': order_line.product_uom.id,
-                        'date': order_line.date_planned,
-                        'date_expected': order_line.date_planned,
-                        'location_id': loc_id,
-                        'location_dest_id': dest,
-                        'picking_id': picking_id,
-                        'move_dest_id': order_line.move_dest_id.id,
-                        'state': 'draft',
-                        'purchase_line_id': order_line.id,
-                        'company_id': order.company_id.id,
-                        'price_unit': order_line.price_unit
-                    })
-                    if order_line.move_dest_id:
-                        self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
-                    todo_moves.append(move)
-            self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
-            self.pool.get('stock.move').force_assign(cr, uid, todo_moves)
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-        raise
-        return picking_id
-
-    def _hook_copy_name(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        HOOK from purchase>purchase.py for COPY function. Modification of default copy values
-        define which name value will be used
-        '''
-        return {'state':'draft',
-                'shipped':False,
-                'invoiced':False,
-                'invoice_ids': [],
-                'picking_ids': [],
-                'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
-                }
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
-        update_values = self._hook_copy_name(cr, uid, [id], context=context, default=default)
-        default.update(update_values)
-        return super(purchase_order, self).copy(cr, uid, id, default, context)
-
     def _hook_o_line_value(self, cr, uid, *args, **kwargs):
-        '''
-        Hook to change the values of the PO line
-        '''
-        return kwargs['o_line']
+        o_line = super(purchase_order, self)._hook_o_line_value(cr, uid, *args, **kwargs)
+        order_line = kwargs['order_line']
+
+        # Copy all fields except order_id and analytic_distribution_id
+        fields = ['product_uom', 'price_unit', 'move_dest_id', 'product_qty', 'partner_id',
+                  'confirmed_delivery_date', 'nomenclature_description', 'default_code',
+                  'nomen_manda_0', 'nomen_manda_1', 'nomen_manda_2', 'nomen_manda_3',
+                  'nomenclature_code', 'name', 'default_name', 'comment', 'date_planned',
+                  'to_correct_ok', 'text_error', 'select_fo', 'project_ref', 'external_ref',
+                  'nomen_sub_0', 'nomen_sub_1', 'nomen_sub_2', 'nomen_sub_3', 'nomen_sub_4',
+                  'nomen_sub_5', 'linked_sol_id', 'change_price_manually', 'old_price_unit',
+                  'origin', 'account_analytic_id', 'product_id', 'company_id', 'notes', 'taxes_id',
+                  'link_so_id', 'from_fo', 'sale_order_line_id', 'tender_line_id', 'dest_partner_id']
+
+        for field in fields:
+            field_val = getattr(order_line, field)
+            if isinstance(field_val, browse_record):
+                field_val = field_val.id
+            elif isinstance(field_val, browse_null):
+                field_val = False
+            elif isinstance(field_val, list):
+                field_val = ((6, 0, tuple([v.id for v in field_val])),)
+            o_line[field] = field_val
+
+
+        # Set the analytic distribution
+        distrib_id = False
+        if order_line.analytic_distribution_id:
+            distrib_id = self.pool.get('analytic.distribution').copy(cr, uid, order_line.analytic_distribution_id.id)
+        elif order_line.order_id.analytic_distribution_id:
+            distrib_id = self.pool.get('analytic.distribution').copy(cr, uid, order_line.order_id.analytic_distribution_id.id)
+
+        o_line['analytic_distribution_id'] = distrib_id
+
+        return o_line
+
 
     def _hook_order_infos(self, cr, uid, *args, **kwargs):
         '''
         Hook to change the values of the PO
         '''
-        return kwargs['order_infos']
+        order_infos = super(purchase_order, self)._hook_order_infos(cr, uid, *args, **kwargs)
+        order_id = kwargs['order_id']
+
+        fields = ['invoice_method', 'minimum_planned_date', 'order_type',
+                  'categ', 'priority', 'internal_type', 'arrival_date',
+                  'transport_type', 'shipment_date', 'ready_to_ship_date',
+                  'cross_docking_ok', 'delivery_confirmed_date',
+                  'est_transport_lead_time', 'transport_mode', 'location_id',
+                  'dest_address_id', 'incoterm_id']
+
+
+        delivery_requested_date = getattr(order_id, 'delivery_requested_date')
+        if not order_infos.get('delivery_requested_date') or delivery_requested_date < order_infos['delivery_requested_date']:
+            order_infos['delivery_requested_date'] = delivery_requested_date
+
+
+        for field in fields:
+            field_val = getattr(order_id, field)
+            if isinstance(field_val, browse_record):
+                field_val = field_val.id
+            elif isinstance(field_val, browse_null):
+                field_val = False
+            elif isinstance(field_val, list):
+                field_val = ((6, 0, tuple([v.id for v in field_val])),)
+            order_infos[field] = field_val
+
+        return order_infos
 
     def do_merge(self, cr, uid, ids, context=None):
         """
@@ -633,11 +1047,11 @@
                         o_line[field] = field_val
                     o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
                     o_line = self._hook_o_line_value(cr, uid, o_line=o_line, order_line=order_line)
-                if order_line.procurement_id:
+                if order_line.linked_sol_id:
                     no_proc_ids.append(order_line.id)
 
             if no_proc_ids:
-                line_obj.write(cr, uid, no_proc_ids, {'procurement_id': False}, context=context)
+                line_obj.write(cr, uid, no_proc_ids, {'linked_sol_id': False}, context=context)
 
         allorders = []
         orders_info = {}
@@ -664,336 +1078,916 @@
                 wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
         return orders_info
 
+    def purchase_cancel(self, cr, uid, ids, context=None):
+        '''
+        Call the wizard to ask if you want to re-source the line
+        '''
+        line_obj = self.pool.get('purchase.order.line')
+        wiz_obj = self.pool.get('purchase.order.cancel.wizard')
+        exp_sol_obj = self.pool.get('expected.sale.order.line')
+        so_obj = self.pool.get('sale.order')
+        data_obj = self.pool.get('ir.model.data')
+        wf_service = netsvc.LocalService("workflow")
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if context.get('rfq_ok', False):
+            view_id = data_obj.get_object_reference(cr, uid, 'tender_flow', 'rfq_cancel_wizard_form_view')[1]
+        else:
+            view_id = data_obj.get_object_reference(cr, uid, 'purchase_override', 'purchase_order_cancel_wizard_form_view')[1]
+
+        for po in self.browse(cr, uid, ids, context=context):
+            for pol in po.order_line:
+                wiz_id = wiz_obj.create(cr, uid, {'order_id': po.id}, context=context)
+                return {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'purchase.order.cancel.wizard',
+                    'res_id': wiz_id,
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'view_id': [view_id],
+                    'target': 'new',
+                    'context': context
+                }
+
+        return True
+
+    def _check_restriction_line(self, cr, uid, ids, context=None):
+        '''
+        Check restriction on products
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        line_obj = self.pool.get('purchase.order.line')
+        res = True
+
+        for order in self.read(cr, uid, ids, ['order_line'], context=context):
+            res = res and line_obj._check_restriction_line(cr, uid, order['order_line'], context=context)
+
+        return res
+
+    def _check_user_company(self, cr, uid, company_id, context=None):
+        '''
+        Remove the possibility to make a PO to user's company
+        '''
+        user_company_id = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context)['company_id'][0]
+        if company_id == user_company_id:
+            raise osv.except_osv(_('Error'), _('You cannot made a purchase order to your own company !'))
+
+        return True
+
+
+    def onchange_internal_type(self, cr, uid, ids, order_type, partner_id, categ, dest_partner_id=False, warehouse_id=False, delivery_requested_date=False):
+        '''
+        Changes the invoice method of the purchase order according to
+        the choosen order type
+        Changes the partner to local market if the type is Purchase List
+        '''
+        partner_obj = self.pool.get('res.partner')
+        v = {}
+        # the domain on the onchange was replace by a several fields.function that you can retrieve in the
+        # file msf_custom_settings/view/purchase_view.xml: domain="[('supplier', '=', True), ('id', '!=', company_id), ('check_partner_po', '=', order_type),  ('check_partner_rfq', '=', tender_id)]"
+        w = {}
+        local_market = None
+        partner = partner_id and partner_obj.read(cr, uid, partner_id, ['partner_type']) or False
+
+        if ids:
+            order_types_dict = dict((x, y) for x, y in ORDER_TYPES_SELECTION)
+            err = []
+            for order in self.read(cr, uid, ids, ['name', 'fixed_order_type', 'order_type', 'is_a_counterpart']):
+                if order['is_a_counterpart'] and order_type != 'loan':
+                    err.append(_('%s: This purchase order is a loan counterpart. You cannot change its order type') % order['name'])
+                else:
+                    json_info = json.loads(order['fixed_order_type'])
+                    if json_info and order_type not in json_info:
+                        allowed_type = ' / '.join(order_types_dict.get(x) for x in json_info)
+                        err.append(
+                            _('%s: Only %s order types are allowed for this purchase order') % (order['name'], allowed_type))
+
+                if err:
+                    return {
+                        'warning': {
+                            'title': _('Error'),
+                            'message': '\n'.join(x for x in err),
+                        },
+                        'value': {
+                            'order_type': order['order_type'],
+                        }
+                    }
+
+        # check if the current PO was created from scratch :
+        if order_type == 'direct':
+            if not self.pool.get('purchase.order.line').search_exist(cr, uid, [('order_id', 'in', ids), ('linked_sol_id', '=', False)]):
+                order_type_value = self.read(cr, uid, ids, ['order_type'])
+                order_type_value = order_type_value[0].get('order_type', 'regular') if order_type_value else 'regular'
+                return {
+                    'value': {'order_type': order_type_value},
+                    'warning': {
+                        'title': _('Error'),
+                        'message': _('You cannot create a direct purchase order from scratch')
+                    },
+                }
+
+        # Search the local market partner id
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj.search(cr, uid,
+                                  [('module', '=', 'order_types'),
+                                   ('model', '=', 'res.partner'),
+                                      ('name', '=', 'res_partner_local_market')],
+                                  limit=1, order='NO_ORDER')
+        if data_id:
+            local_market = data_obj.read(cr, uid, data_id, ['res_id'])[0]['res_id']
+
+        if order_type == 'loan':
+            setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
+
+            if not setup.field_orders_ok:
+                return {'value': {'order_type': 'regular'},
+                        'warning': {'title': 'Error',
+                                    'message': 'The Field orders feature is not activated on your system, so, you cannot create a Loan Purchase Order !'}}
+
+        if order_type in ['donation_exp', 'donation_st']:
+            v['invoice_method'] = partner and partner['partner_type'] == 'section' and 'picking' or 'manual'
+        elif order_type == 'loan':
+            v['invoice_method'] = 'manual'
+        elif order_type in ['direct']:
+            v['invoice_method'] = 'order'
+        elif order_type in ['in_kind', 'purchase_list']:
+            v['invoice_method'] = 'picking'
+        else:
+            v['invoice_method'] = 'picking'
+
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.partner_id.id
+
+        if order_type == 'direct' and dest_partner_id and dest_partner_id != company_id:
+            cp_address_id = self.pool.get('res.partner').address_get(cr, uid, dest_partner_id, ['delivery'])['delivery']
+            v.update({'dest_address_id': cp_address_id})
+        elif order_type == 'direct':
+            v.update({'dest_address_id': False, 'dest_partner_id': False})
+        else:
+            cp_address_id = self.pool.get('res.partner').address_get(cr, uid, company_id, ['delivery'])['delivery']
+            v.update({'dest_address_id': cp_address_id, 'dest_partner_id': company_id})
+
+        if partner and partner_id != local_market:
+            if partner['partner_type'] in ('internal', 'esc') and order_type in ('regular', 'direct'):
+                v['invoice_method'] = 'manual'
+            elif partner['partner_type'] not in ('external', 'esc') and order_type == 'direct':
+                v.update({'partner_address_id': False, 'partner_id': False, 'pricelist_id': False,})
+                w.update({'message': 'You cannot have a Direct Purchase Order with a partner which is not external or an ESC',
+                          'title': 'An error has occurred !'})
+        elif partner_id and partner_id == local_market and order_type != 'purchase_list':
+            v['partner_id'] = None
+            v['partner_address_id'] = None
+            v['pricelist_id'] = None
+
+        if order_type == 'purchase_list':
+            if local_market:
+                partner = self.pool.get('res.partner').browse(cr, uid, local_market)
+                v['partner_id'] = partner.id
+                if partner.address:
+                    v['partner_address_id'] = partner.address[0].id
+                if partner.property_product_pricelist_purchase:
+                    v['pricelist_id'] = partner.property_product_pricelist_purchase.id
+        elif order_type == 'direct':
+            v['cross_docking_ok'] = False
+
+        return {'value': v, 'warning': w}
+
+    def onchange_partner_id(self, cr, uid, ids, part, *a, **b):
+        '''
+        Fills the Requested and Confirmed delivery dates
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if not part:
+            return  {'value':{'partner_address_id': False, 'fiscal_position': False}}
+
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
+        part = self.pool.get('res.partner').browse(cr, uid, part)
+        pricelist = part.property_product_pricelist_purchase.id
+        fiscal_position = part.property_account_position and part.property_account_position.id or False
+        res = {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
+
+
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        partner = partner_obj.read(cr, uid, part.id, ['partner_type'])
+        if ids:
+            # Check the restrction of product in lines
+            for order in self.browse(cr, uid, ids):
+                for line in order.order_line:
+                    if line.product_id:
+                        res, test = product_obj._on_change_restriction_error(cr, uid, line.product_id.id, field_name='partner_id', values=res, vals={'partner_id': part})
+                        if test:
+                            res.setdefault('value', {}).update({'partner_address_id': False})
+                            return res
+        if partner['partner_type'] in ('internal', 'esc'):
+            res['value']['invoice_method'] = 'manual'
+        elif ids and partner['partner_type'] == 'intermission':
+            try:
+                intermission = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution',
+                                                                                   'analytic_account_project_intermission')[1]
+            except ValueError:
+                intermission = 0
+            cr.execute('''select po.id from purchase_order po
+                left join purchase_order_line pol on pol.order_id = po.id
+                left join cost_center_distribution_line cl1 on cl1.distribution_id = po.analytic_distribution_id
+                left join cost_center_distribution_line cl2 on cl2.distribution_id = pol.analytic_distribution_id
+                where po.id in %s and (cl1.analytic_id!=%s or cl2.analytic_id!=%s)''', (tuple(ids), intermission, intermission))
+            if cr.rowcount > 0:
+                res.setdefault('warning', {})
+                msg = _('You set an intermission partner, at validation Cost Centers will be changed to intermission.')
+                if res.get('warning', {}).get('message'):
+                    res['warning']['message'] += msg
+                else:
+                    res['warning'] = {'title': _('Warning'), 'message': msg}
+        return res
+
+    def onchange_warehouse_id(self, cr, uid, ids,  warehouse_id, order_type, dest_address_id):
+        '''
+        Change the destination address to the destination address of the company if False
+        '''
+        res = {}
+        if not warehouse_id:
+            wh_info = self.pool.get('stock.warehouse').read(cr, uid, [warehouse_id], ['lot_input_id'])
+            res = {'value':{'location_id': wh_info[0]['lot_input_id'][0], 'dest_address_id': False, 'cross_docking_ok': False}}
+
+        if not res.get('value', {}).get('dest_address_id') and order_type!='direct':
+            cp_address_id = self.pool.get('res.partner').address_get(cr, uid, self.pool.get('res.users').browse(cr, uid, uid).company_id.partner_id.id, ['delivery'])['delivery']
+            if 'value' in res:
+                res['value'].update({'dest_address_id': cp_address_id})
+            else:
+                res.update({'value': {'dest_address_id': cp_address_id}})
+        if order_type == 'direct' or dest_address_id:
+            if 'dest_address_id' in res.get('value', {}):
+                res['value'].pop('dest_address_id')
+
+        return res
+
+    def on_change_dest_partner_id(self, cr, uid, ids, dest_partner_id, context=None):
+        '''
+        Fill automatically the destination address according to the destination partner
+        '''
+        v = {}
+
+        if not context:
+            context = {}
+
+        if not dest_partner_id:
+            v.update({'dest_address_id': False})
+        else:
+            delivery_addr = self.pool.get('res.partner').address_get(cr, uid, dest_partner_id, ['delivery'])
+            v.update({'dest_address_id': delivery_addr['delivery']})
+        return {'value': v}
+
+    def change_currency(self, cr, uid, ids, context=None):
+        '''
+        Launches the wizard to change the currency and update lines
+        '''
+        if not context:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for order in self.browse(cr, uid, ids, context=context):
+            data = {'order_id': order.id,
+                    'partner_id': order.partner_id.id,
+                    'partner_type': order.partner_id.partner_type,
+                    'new_pricelist_id': order.pricelist_id.id,
+                    'currency_rate': 1.00,
+                    'old_pricelist_id': order.pricelist_id.id}
+            wiz = self.pool.get('purchase.order.change.currency').create(cr, uid, data, context=context)
+            return {'type': 'ir.actions.act_window',
+                    'res_model': 'purchase.order.change.currency',
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_id': wiz,
+                    'target': 'new'}
+
+        return True
+
+    def order_line_change(self, cr, uid, ids, order_line):
+        res = {'no_line': True}
+
+        if order_line:
+            res = {'no_line': False}
+
+        return {'value': res}
+
+    def _get_destination_ok(self, cr, uid, lines, context):
+        dest_ok = False
+        for line in lines:
+            is_inkind = line.order_id and line.order_id.order_type == 'in_kind' or False
+            dest_ok = line.account_4_distribution and line.account_4_distribution.destination_ids or False
+            if not dest_ok:
+                if is_inkind:
+                    raise osv.except_osv(_('Error'), _('No destination found. An In-kind Donation account is probably missing for this line: %s.') % (line.name or ''))
+                raise osv.except_osv(_('Error'), _('No destination found for this line: %s.') % (line.name or '',))
+        return dest_ok
+
+    def check_analytic_distribution(self, cr, uid, ids, context=None, create_missing=False):
+        """
+        Check analytic distribution validity for given PO.
+        Also check that partner have a donation account (is PO is in_kind)
+        """
+        # Objects
+        pol_obj = self.pool.get('purchase.order.line')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        po_line_ids = pol_obj.search(cr, uid, [('oder_id', 'in', id), ('state', '!=', 'cancelled')], context=context)
+        if po_line_ids:
+            return pol_obj.check_analytic_distribution(cr, uid, po_line_ids, context=context, create_missing=create_missing)
+        return True
+
+    def check_if_stock_take_date_with_esc_partner(self, cr, uid, ids, context=None):
+        """
+        Check if the PO and all lines have a date of stock take with an ESC Partner
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for po in self.browse(cr, uid, ids, context=context):
+            if po.partner_type == 'esc':
+                if not po.stock_take_date and self.pool.get('purchase.order.line').search_exist(cr, uid, [('order_id', '=', po.id), ('stock_take_date', '=', False)], context=context):
+                    raise osv.except_osv(_('Warning !'), _(
+                        'The Date of Stock Take is required for a Purchase Order if the Partner is an ESC.'))
+                if self.pool.get('purchase.order.line').search_exist(cr, uid, [('order_id', '=', po.id), ('stock_take_date', '=', False)], context=context):
+                    raise osv.except_osv(_('Warning !'), _('The Date of Stock Take is required for all Purchase Order lines if the Partner is an ESC.'))
+        return True
+
+    def get_so_ids_from_po_ids(self, cr, uid, ids, context=None):
+        '''
+        receive the list of purchase order ids
+        return the list of sale order ids corresponding
+        '''
+        if not context:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        so_ids = set()
+        for po in self.browse(cr, uid, ids, context=context):
+            for pol in po.order_line:
+                if pol.linked_sol_id:
+                    so_ids.add(pol.linked_sol_id.order_id.id)
+
+        return list(so_ids)
+
+    def get_sol_ids_from_po_ids(self, cr, uid, ids, context=None):
+        '''
+        receive the list of purchase order ids
+        return the list of sale order line ids corresponding
+        '''
+        if not context:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        sol_ids = set()
+        for po in self.browse(cr, uid, ids, context=context):
+            for pol in po.order_line:
+                if pol.linked_sol_id:
+                    sol_ids.add(pol.linked_sol_id.id)
+
+        return list(sol_ids)
+
+    def compute_confirmed_delivery_date(self, cr, uid, ids, confirmed, prep_lt, ship_lt, est_transport_lead_time, db_date_format, context=None):
+        '''
+        compute the confirmed date
+
+        confirmed must be string
+        return string corresponding to database format
+        '''
+        assert type(confirmed) == str
+        confirmed = datetime.strptime(confirmed, db_date_format)
+        confirmed = confirmed + relativedelta(days=prep_lt or 0)
+        confirmed = confirmed + relativedelta(days=ship_lt or 0)
+        confirmed = confirmed + relativedelta(days=est_transport_lead_time or 0)
+        confirmed = confirmed.strftime(db_date_format)
+
+        return confirmed
+
+    def has_stockable_product(self,cr, uid, ids, *args):
+        '''
+        Override the has_stockable_product to return False
+        when the order_type of the order is 'direct'
+        '''
+
+        # TODO: See with Synchro team which object the system will should create
+        # to have an Incoming Movement in the destination instance
+        for order in self.read(cr, uid, ids, ['order_type']):
+            if order['order_type'] != 'direct':
+                for order in self.browse(cr, uid, ids):
+                    for order_line in order.order_line:
+                        if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                            return True
+        return False
+
+    def ensure_object(self, cr, uid, model, value):
+        if isinstance(value, (int, long)):
+            value = self.pool.get(model).browse(cr, uid, value)
+        return value
+
+    def get_reason_type_id(self, cr, uid, order, context=None):
+
+        def get_reference(reason):
+            return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'reason_types_moves', reason)[1]
+
+        order = self.ensure_object(cr, uid, 'purchase.order', order)
+
+        reason_type_id = False
+        if order.order_type in ('regular', 'purchase_list', 'direct') and \
+                order.partner_id.partner_type in ('internal', 'intermission', 'section', 'esc'):
+            reason_type_id = get_reference('reason_type_internal_supply')
+        elif order.order_type in ('regular', 'purchase_list', 'direct'):
+            reason_type_id = get_reference('reason_type_external_supply')
+        elif order.order_type == 'loan':
+            reason_type_id = get_reference('reason_type_loan')
+        elif order.order_type == 'donation_st':
+            reason_type_id = get_reference('reason_type_donation')
+        elif order.order_type == 'donation_exp':
+            reason_type_id = get_reference('reason_type_donation_expiry')
+        elif order.order_type == 'in_kind':
+            reason_type_id = get_reference('reason_type_in_kind_donation')
+        return reason_type_id
+
+    def create_picking(self, cr, uid, order, context=None):
+        if context is None:
+            context = {}
+
+        order = self.ensure_object(cr, uid, 'purchase.order', order)
+
+        values = {
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
+            'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
+            'type': 'in',
+            'partner_id2': order.partner_id.id,
+            'address_id': order.partner_address_id.id or False,
+            'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
+            'purchase_id': order.id,
+            'company_id': order.company_id.id,
+            'move_lines': [],
+        }
+
+        reason_type_id = self.get_reason_type_id(cr, uid, order, context)
+        if reason_type_id:
+            values.update({'reason_type_id': reason_type_id})
+
+        return self.pool.get('stock.picking').create(cr, uid, values, context=context)
+
+    def create_picking_line(self, cr, uid, picking_id, order_line, context=None):
+        if context is None:
+            context = {}
+
+        order_line = self.ensure_object(cr, uid, 'purchase.order.line', order_line)
+        if not order_line:
+            return False
+
+        picking_id = self.ensure_object(cr, uid, 'stock.picking', picking_id)
+        order = order_line.order_id
+        dest = order.location_id.id
+
+        move_obj = self.pool.get('stock.move')
+        data_obj = self.pool.get('ir.model.data')
+
+        # service with reception are directed to Service Location
+        if order_line.product_id.type == 'service_recep' and not order.cross_docking_ok:
+            dest = self.pool.get('stock.location').get_service_location(cr, uid)
+        else:
+            sol = order_line.linked_sol_id
+            if sol:
+                if not (sol.order_id and sol.order_id.procurement_request):
+                    pass
+                elif order_line.product_id.type == 'service_recep':
+                    dest = self.pool.get('stock.location').get_service_location(cr, uid)
+                elif order_line.product_id.type == 'consu':
+                    dest = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
+                elif sol.order_id.location_requestor_id.usage != 'customer':
+                    dest = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_input')[1]
+
+        values = {
+            'name': ''.join((order.name, ': ', (order_line.name or ''))),
+            'product_id': order_line.product_id.id,
+            'product_qty': order_line.product_qty,
+            'product_uos_qty': order_line.product_qty,
+            'product_uom': order_line.product_uom.id,
+            'product_uos': order_line.product_uom.id,
+            'location_id': order.partner_id.property_stock_supplier.id,
+            'location_dest_id': dest,
+            'picking_id': picking_id.id,
+            'move_dest_id': order_line.move_dest_id.id,
+            'state': 'draft',
+            'purchase_line_id': order_line.id,
+            'company_id': order.company_id.id,
+            'price_currency_id': order.pricelist_id.currency_id.id,
+            'price_unit': order_line.price_unit,
+            'date': order_line.confirmed_delivery_date,
+            'date_expected': order_line.confirmed_delivery_date or order_line.date_planned,
+            'line_number': order_line.line_number,
+            'comment': order_line.comment,
+        }
+
+        if picking_id.reason_type_id:
+            values.update({'reason_type_id': picking_id.reason_type_id.id})
+
+        ctx = context.copy()
+        ctx['bypass_store_function'] = [
+            ('stock.picking', ['dpo_incoming', 'dpo_out', 'overall_qty', 'line_state'])
+        ]
+
+        return move_obj.create(cr, uid, values, context=ctx)
+
+
+    def _get_location_id(self, cr, uid, vals, warehouse_id=False, context=None):
+        """
+        Get the location_id according to the cross_docking_ok option
+        Return vals
+        """
+        if 'cross_docking_ok' not in vals:
+            return vals
+
+        stock_warehouse_obj = self.pool.get('stock.warehouse')
+        if not warehouse_id:
+            warehouse_id = stock_warehouse_obj.search(cr, uid, [], context=context)[0]
+
+        if isinstance(warehouse_id, (str,unicode)):
+            try:
+                warehouse_id = int(warehouse_id)
+            except ValueError:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('The field \'warehouse_id\' is a float field but value is a string - Please contact your administrator'),
+                )
+
+        if not vals.get('cross_docking_ok', False):
+            vals.update({'location_id': stock_warehouse_obj.read(cr, uid, warehouse_id, ['lot_input_id'], context=context)['lot_input_id'][0]})
+        elif vals.get('cross_docking_ok', False):
+            vals.update({'location_id': self.pool.get('stock.location').get_cross_docking_location(cr, uid)})
+
+        return vals
+
+    def set_manually_done(self, cr, uid, ids, all_doc=True, context=None):
+        '''
+        Set the PO to done state
+        '''
+        wf_service = netsvc.LocalService("workflow")
+        so_obj = self.pool.get('sale.order')
+        move_obj = self.pool.get('stock.move')
+
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        order_lines = []
+        for order in self.browse(cr, uid, ids, context=context):
+            for line in order.order_line:
+                order_lines.append(line.id)
+
+            # Done picking
+            for pick in order.picking_ids:
+                if pick.state not in ('cancel', 'done'):
+                    wf_service.trg_validate(uid, 'stock.picking', pick.id, 'manually_done', cr)
+
+            # Done loan counterpart
+            if order.loan_id and order.loan_id.state not in ('cancel', 'done') and not context.get('loan_id', False) == order.id:
+                loan_context = context.copy()
+                loan_context.update({'loan_id': order.id})
+                so_obj.set_manually_done(cr, uid, order.loan_id.id, all_doc=all_doc, context=loan_context)
+
+        # Done stock moves
+        move_ids = move_obj.search(cr, uid, [('purchase_line_id', 'in', order_lines), ('state', 'not in', ('cancel', 'done'))], context=context)
+        move_obj.set_manually_done(cr, uid, move_ids, all_doc=all_doc, context=context)
+
+        # Cancel all procurement ordes which have generated one of these PO
+        proc_ids = self.pool.get('procurement.order').search(cr, uid, [('purchase_id', 'in', ids)], context=context)
+        for proc in self.pool.get('procurement.order').browse(cr, uid, proc_ids, context=context):
+            if proc.move_id and proc.move_id.id:
+                move_obj.write(cr, uid, [proc.move_id.id], {'state': 'cancel'}, context=context)
+            wf_service.trg_validate(uid, 'procurement.order', proc.id, 'subflow.cancel', cr)
+
+        if all_doc:
+            # Detach the PO from his workflow and set the state to done
+            for order_id in self.browse(cr, uid, ids, context=context):
+                if order_id.rfq_ok and order_id.state == 'draft':
+                    wf_service.trg_validate(uid, 'purchase.order', order_id.id, 'purchase_cancel', cr)
+                elif order_id.tender_id:
+                    raise osv.except_osv(_('Error'), _('You cannot \'Close\' a Request for Quotation attached to a tender. Please make the tender %s to \'Closed\' before !') % order_id.tender_id.name)
+                else:
+                    wf_service.trg_delete(uid, 'purchase.order', order_id.id, cr)
+                    # Search the method called when the workflow enter in last activity
+                    wkf_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'purchase', 'act_done')[1]
+                    activity = self.pool.get('workflow.activity').browse(cr, uid, wkf_id, context=context)
+                    _eval_expr(cr, [uid, 'purchase.order', order_id.id], False, activity.action)
+
+        return True
+
+
+    def check_empty_po(self, cr, uid, ids, context=None):
+        """
+        If the PO is empty, return a wizard to ask user if he wants
+        cancel the whole PO
+        """
+        order_wiz_obj = self.pool.get('purchase.order.cancel.wizard')
+        data_obj = self.pool.get('ir.model.data')
+
+        for po in self.browse(cr, uid, ids, context=context):
+            if all(x.state in ('cancel', 'done') for x in po.order_line):
+                wiz_id = order_wiz_obj.create(cr, uid, {'order_id': po.id}, context=context)
+                if po.rfq_ok:
+                    view_id = data_obj.get_object_reference(cr, uid, 'tender_flow', 'ask_rfq_cancel_wizard_form_view')[1]
+                else:
+                    view_id = data_obj.get_object_reference(cr, uid, 'purchase_override', 'ask_po_cancel_wizard_form_view')[1]
+                context['view_id'] = False
+                return {'type': 'ir.actions.act_window',
+                        'res_model': 'purchase.order.cancel.wizard',
+                        'view_type': 'form',
+                        'view_mode': 'form',
+                        'view_id': [view_id],
+                        'res_id': wiz_id,
+                        'target': 'new',
+                        'context': context}
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    def round_to_soq(self, cr, uid, ids, context=None):
+        """
+        Create a new thread to check for each line of the order if the quantity
+        is compatible with the SoQ rounding of the supplier catalogue or
+        product. If not compatible, update the quantity to match with SoQ rounding.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of sale.order to check and update
+        :param context: Context of the call
+        :return: True
+        """
+        th = threading.Thread(
+            target=self._do_round_to_soq,
+            args=(cr, uid, ids, context, True),
+        )
+        th.start()
+        th.join(5.0)
+
+        return True
+
+    def _do_round_to_soq(self, cr, uid, ids, context=None, use_new_cursor=False):
+        """
+        Check for each line of the order if the quantity is compatible
+        with the SoQ rounding of the supplier catalogue or product. If
+        not compatible, update the quantity to match with SoQ rounding.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of sale.order to check and update
+        :param context: Context of the call
+        :param use_new_cursor: True if this method is called into a new thread
+        :return: True
+        """
+        pol_obj = self.pool.get('purchase.order.line')
+        uom_obj = self.pool.get('product.uom')
+        sup_obj = self.pool.get('product.supplierinfo')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if use_new_cursor:
+            cr = pooler.get_db(cr.dbname).cursor()
+
+        try:
+            self.write(cr, uid, ids, {
+                'update_in_progress': True,
+            }, context=context)
+            if use_new_cursor:
+                cr.commit()
+
+            pol_ids = pol_obj.search(cr, uid, [
+                ('order_id', 'in', ids),
+                ('product_id', '!=', False),
+            ], context=context)
+
+            to_update = {}
+            for pol in pol_obj.browse(cr, uid, pol_ids, context=context):
+                # Check only products with defined SoQ quantity
+                sup_ids = sup_obj.search(cr, uid, [
+                    ('name', '=', pol.order_id.partner_id.id),
+                    ('product_id', '=', pol.product_id.id),
+                ], context=context)
+                if not sup_ids and not pol.product_id.soq_quantity:
+                    continue
+
+                # Get SoQ value
+                soq = pol.product_id.soq_quantity
+                soq_uom = pol.product_id.uom_id
+                if sup_ids:
+                    for sup in sup_obj.browse(cr, uid, sup_ids, context=context):
+                        for pcl in sup.pricelist_ids:
+                            if pcl.rounding and pcl.min_quantity <= pol.product_qty:
+                                soq = pcl.rounding
+                                soq_uom = pcl.uom_id
+
+                if not soq:
+                    continue
+
+                # Get line quantity in SoQ UoM
+                line_qty = pol.product_qty
+                if pol.product_uom.id != soq_uom.id:
+                    line_qty = uom_obj._compute_qty_obj(cr, uid, pol.product_uom, pol.product_qty, soq_uom, context=context)
+
+                good_quantity = 0
+                if line_qty % soq:
+                    good_quantity = (line_qty - (line_qty % soq)) + soq
+
+                if good_quantity and pol.product_uom.id != soq_uom.id:
+                    good_quantity = uom_obj._compute_qty_obj(cr, uid, soq_uom, good_quantity, pol.product_uom, context=context)
+
+                if good_quantity:
+                    to_update.setdefault(good_quantity, [])
+                    to_update[good_quantity].append(pol.id)
+
+            for qty, line_ids in to_update.iteritems():
+                pol_obj.write(cr, uid, line_ids, {
+                    'product_qty': qty,
+                    'soq_updated': True,
+                }, context=context)
+        except Exception as e:
+            logger = logging.getLogger('purchase.order.round_to_soq')
+            logger.error(e)
+        finally:
+            self.write(cr, uid, ids, {
+                'update_in_progress': False,
+            }, context=context)
+
+        if use_new_cursor:
+            cr.commit()
+            cr.close(True)
+
+        return True
+
+#CTRL
+    def update_supplier_info(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        update the supplier info of corresponding products
+        '''
+        info_obj = self.pool.get('product.supplierinfo')
+        pricelist_info_obj = self.pool.get('pricelist.partnerinfo')
+        for rfq in self.browse(cr, uid, ids, context=context):
+            for line in rfq.order_line:
+                # if the price is updated and a product selected
+                if line.price_unit and line.product_id:
+                    # get the product
+                    product = line.product_id
+                    # find the corresponding suppinfo with sequence -99
+                    info_99_list = info_obj.search(cr, uid, [('product_id', '=', product.product_tmpl_id.id),
+                                                             ('sequence', '=', -99)],
+                                                   order='NO_ORDER', context=context)
+
+                    if info_99_list:
+                        # we drop it
+                        info_obj.unlink(cr, uid, info_99_list, context=context)
+
+                    # create the new one
+                    values = {'name': rfq.partner_id.id,
+                              'product_name': False,
+                              'product_code': False,
+                              'sequence' : -99,
+                              #'product_uom': line.product_uom.id,
+                              #'min_qty': 0.0,
+                              #'qty': function
+                              'product_id' : product.product_tmpl_id.id,
+                              'delay' : int(rfq.partner_id.default_delay),
+                              #'pricelist_ids': created just after
+                              #'company_id': default value
+                              }
+
+                    new_info_id = info_obj.create(cr, uid, values, context=context)
+                    # price lists creation - 'pricelist.partnerinfo
+                    values = {'suppinfo_id': new_info_id,
+                              'min_quantity': 1.00,
+                              'price': line.price_unit,
+                              'uom_id': line.product_uom.id,
+                              'currency_id': line.currency_id.id,
+                              'valid_till': rfq.valid_till,
+                              'purchase_order_line_id': line.id,
+                              'comment': 'RfQ original quantity for price : %s' % line.product_qty,
+                              }
+                    pricelist_info_obj.create(cr, uid, values, context=context)
+
+        return True
+
+    def generate_po_from_rfq(self, cr, uid, ids, context=None):
+        '''
+        generate a po from the selected request for quotation
+        '''
+        # Objects
+        line_obj = self.pool.get('purchase.order.line')
+
+        # Some verifications
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        # update price lists
+        self.update_supplier_info(cr, uid, ids, context=context)
+        # copy the po with rfq_ok set to False
+        data = self.read(cr, uid, ids[0], ['name', 'amount_total'], context=context)
+        if not data.get('amount_total', 0.00):
+            raise osv.except_osv(
+                _('Error'),
+                _('Generation of PO aborted because no price defined on lines.'),
+            )
+        new_po_id = self.copy(cr, uid, ids[0], {'name': False, 'rfq_ok': False, 'origin': data['name']}, context=dict(context,keepOrigin=True))
+        # Remove lines with 0.00 as unit price
+        no_price_line_ids = line_obj.search(cr, uid, [
+            ('order_id', '=', new_po_id),
+            ('price_unit', '=', 0.00),
+        ], order='NO_ORDER', context=context)
+        line_obj.unlink(cr, uid, no_price_line_ids, context=context)
+
+        data = self.read(cr, uid, new_po_id, ['name'], context=context)
+        # log message describing the previous action
+        self.log(cr, uid, new_po_id, _('The Purchase Order %s has been generated from Request for Quotation.')%data['name'])
+        # close the current po
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order', ids[0], 'rfq_done', cr)
+
+        return new_po_id
+
+
+    def create_commitment_voucher_from_po(self, cr, uid, ids, context=None):
+        '''
+        Create a new commitment voucher from the given PO
+        @param ids id of the Purchase order
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        commit_id = False
+        for po in self.pool.get('purchase.order').browse(cr, uid, ids, context=context):
+            engagement_ids = self.pool.get('account.analytic.journal').search(cr, uid, [
+                ('type', '=', 'engagement'),
+                ('instance_id', '=', self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id.id)
+            ], limit=1, context=context)
+
+            vals = {
+                'journal_id': engagement_ids and engagement_ids[0] or False,
+                'currency_id': po.currency_id and po.currency_id.id or False,
+                'partner_id': po.partner_id and po.partner_id.id or False,
+                'purchase_id': po.id or False,
+                'type': 'external' if po.partner_id.partner_type == 'external' else 'manual',
+            }
+            # prepare some values
+            today = time.strftime('%Y-%m-%d')
+            period_ids = get_period_from_date(self, cr, uid, po.delivery_confirmed_date or today, context=context)
+            period_id = period_ids and period_ids[0] or False
+            if not period_id:
+                raise osv.except_osv(_('Error'), _('No period found for given date: %s.') % (po.delivery_confirmed_date or today))
+            date = get_date_in_period(self, cr, uid, po.delivery_confirmed_date or today, period_id, context=context)
+            vals.update({
+                'date': date,
+                'period_id': period_id,
+            })
+            commit_id = self.pool.get('account.commitment').create(cr, uid, vals, context=context)
+
+            # Display a message to inform that a commitment was created
+            commit_data = self.pool.get('account.commitment').read(cr, uid, commit_id, ['name'], context=context)
+            message = _("Commitment Voucher %s has been created.") % commit_data.get('name', '')
+            view_ids = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'account_commitment_form')
+            self.pool.get('account.commitment').log(cr, uid, commit_id, message, context={'view_id': view_ids and view_ids[1] or False})
+            self.infolog(cr, uid, message)
+
+            # Add analytic distribution from purchase
+            if po.analytic_distribution_id:
+                new_distrib_id = self.pool.get('analytic.distribution').copy(cr, uid, po.analytic_distribution_id.id, {}, context=context)
+                # Update this distribution not to have a link with purchase but with new commitment
+                if new_distrib_id:
+                    self.pool.get('analytic.distribution').write(cr, uid, [new_distrib_id],
+                                                                 {'purchase_id': False, 'commitment_id': commit_id}, context=context)
+                    # Create funding pool lines if needed
+                    self.pool.get('analytic.distribution').create_funding_pool_lines(cr, uid, [new_distrib_id], context=context)
+                    # Update commitment with new analytic distribution
+                    self.pool.get('account.commitment').write(cr, uid, [commit_id], {'analytic_distribution_id': new_distrib_id}, context=context)
+
+        return commit_id
+
 purchase_order()
 
-class purchase_order_line(osv.osv):
-    def _amount_line(self, cr, uid, ids, prop, arg, context=None):
-        res = {}
-        cur_obj=self.pool.get('res.currency')
-        tax_obj = self.pool.get('account.tax')
-        for line in self.browse(cr, uid, ids, context=context):
-            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
-            cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur.rounding, taxes['total'])
-            if line.price_unit > 0 and res[line.id] < 0.01:
-                res[line.id] = 0.01
-        return res
-
-    def _get_stock_take_date(self, cr, uid, context=None):
-        '''
-            Returns stock take date
-        '''
-        if context is None:
-            context = {}
-        order_obj = self.pool.get('purchase.order')
-        res = False
-
-        if context.get('purchase_id', False):
-            po = order_obj.browse(cr, uid, context.get('purchase_id'), context=context)
-            res = po.stock_take_date
-
-        return res
-
-    _columns = {
-        'name': fields.char('Description', size=256, required=True),
-        'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
-        'date_planned': fields.date('Scheduled Date', required=True, select=True),
-        'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, select=True),
-        'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True, select=True),
-        'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
-        'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null', select=True),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
-        'notes': fields.text('Notes'),
-        'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
-        'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
-        'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True,
-                                  help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
-                                       \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
-                                       \n* The \'Done\' state is set automatically when purchase order is set as done. \
-                                       \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'),
-        'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
-        'invoiced': fields.boolean('Invoiced', readonly=True),
-        '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),
-    }
-    _defaults = {
-        'product_qty': lambda *a: 1.0,
-        'state': lambda *args: 'draft',
-        'invoiced': lambda *a: 0,
-        'stock_take_date': _get_stock_take_date,
-    }
-    _table = 'purchase_order_line'
-    _name = 'purchase.order.line'
-    _description = 'Purchase Order Line'
-
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
-        default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]})
-        return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
-
-    def _hook_product_id_change(self, cr, uid, *args, **kwargs):
-        '''
-        Override the computation of product qty to order
-        '''
-        prod = kwargs['product']
-        partner_id = kwargs['partner_id']
-        qty = kwargs['product_qty']
-
-        product_uom_pool = self.pool.get('product.uom')
-
-        res = {}
-        for s in prod.seller_ids:
-            if s.name.id == partner_id:
-                seller_delay = s.delay
-                if s.product_uom:
-                    temp_qty = product_uom_pool._compute_qty(cr, uid, s.product_uom.id, s.min_qty, to_uom_id=prod.uom_id.id)
-                    uom = s.product_uom.id #prod_uom_po
-                temp_qty = s.min_qty # supplier _qty assigned to temp
-                if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
-                    qty = temp_qty
-                    res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s, you cannot purchase less.') % qty}})
-        qty_in_product_uom = product_uom_pool._compute_qty(cr, uid, uom, qty, to_uom_id=prod.uom_id.id)
-        return res, qty_in_product_uom, qty, seller_delay
-
-
-    def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
-                          partner_id, date_order=False, fiscal_position=False, date_planned=False,
-                          name=False, price_unit=False, notes=False):
-        if not pricelist:
-            raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
-        if not  partner_id:
-            raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.'))
-        if not product:
-            return {'value': {'price_unit': price_unit or 0.0, 'name': name or '',
-                              'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
-        res = {}
-        prod= self.pool.get('product.product').browse(cr, uid, product)
-
-        lang=False
-        if partner_id:
-            lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang']
-        context={'lang':lang}
-        context['partner_id'] = partner_id
-
-        prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
-        prod_uom_po = prod.uom_po_id.id
-        if not uom:
-            uom = prod_uom_po
-        if not date_order:
-            date_order = time.strftime('%Y-%m-%d')
-        qty = qty or 1.0
-        seller_delay = 0
-
-        prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
-
-        res, qty_in_product_uom, qty, seller_delay = self._hook_product_id_change(cr, uid, product=prod, partner_id=partner_id,
-                                                                                  product_qty=qty, pricelist=pricelist, order_date=date_order, uom_id=uom, 
-                                                                                  seller_delay=seller_delay, res=res, context=context)
-
-        price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
-                                                             product, qty_in_product_uom or 1.0, partner_id, {
-            'uom': uom,
-            'date': date_order,
-        })[pricelist]
-        if price is False:
-            warning = {
-                'title': 'No valid pricelist line found !',
-                'message':
-                    "Couldn't find a pricelist line matching this product and quantity.\n"
-                    "You have to change either the product, the quantity or the pricelist."
-            }
-            res.update({'warning': warning})
-        dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
-
-
-        res.update({'value': {'price_unit': price, 'name': prod_name,
-                              'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
-                              'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
-                              'product_qty': qty,
-                              'product_uom': uom}})
-        domain = {}
-
-        taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
-        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
-        res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
-        res3 = prod.uom_id.category_id.id
-        domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
-        if res2[0]['category_id'][0] != res3:
-            raise osv.except_osv(_('Wrong Product UOM !'), _('You have to select a product UOM in the same category than the purchase UOM of the product'))
-
-        res['domain'] = domain
-        return res
-
-    def product_uom_change(self, cr, uid, ids, pricelist, product, qty, uom,
-                           partner_id, date_order=False, fiscal_position=False, date_planned=False,
-                           name=False, price_unit=False, notes=False):
-        res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-                                     partner_id, date_order=date_order, fiscal_position=fiscal_position, date_planned=date_planned,
-                                     name=name, price_unit=price_unit, notes=notes)
-        if 'product_uom' in res['value']:
-            if uom and (uom != res['value']['product_uom']) and res['value']['product_uom']:
-                seller_uom_name = self.pool.get('product.uom').read(cr, uid, [res['value']['product_uom']], ['name'])[0]['name']
-                res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % seller_uom_name }})
-            del res['value']['product_uom']
-        if not uom:
-            res['value']['price_unit'] = 0.0
-        return res
-
-    def action_confirm(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
-        return True
-
-purchase_order_line()
-
-class procurement_order(osv.osv):
-    _inherit = 'procurement.order'
-    _columns = {
-        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
-    }
-
-    def action_po_assign(self, cr, uid, ids, context=None):
-        """ This is action which call from workflow to assign purchase order to procurements
-        @return: True
-        """
-        res = self.make_po(cr, uid, ids, context=context)
-        res = res.values()
-        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
-
-    def get_partner_hook(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        return a dictionary with partner, seller_qty and seller_delay
-        '''
-        result = {}
-
-        procurement = kwargs['procurement']
-        partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
-        seller_qty = procurement.product_id.seller_qty
-        seller_delay = int(procurement.product_id.seller_delay)
-
-        result.update(partner=partner,
-                      seller_qty=seller_qty,
-                      seller_delay=seller_delay)
-
-        return result
-
-    def po_line_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        Please copy this to your module's method also.
-        This hook belongs to the make_po method from purchase>purchase.py>procurement_order
-
-        - allow to modify the data for purchase order line creation
-        '''
-        line = kwargs['line']
-        return line
-
-    def po_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        Please copy this to your module's method also.
-        This hook belongs to the make_po method from purchase>purchase.py>procurement_order
-
-        - allow to modify the data for purchase order creation
-        '''
-        values = kwargs['values']
-        return values
-
-    def create_po_hook(self, cr, uid, ids, context=None, *args, **kwargs):
-        '''
-        creation of purchase order
-        return the id of newly created po
-        '''
-        po_obj = self.pool.get('purchase.order')
-        values = kwargs['values']
-        purchase_id = po_obj.create(cr, uid, values, context=context)
-        return purchase_id
-
-    def make_po(self, cr, uid, ids, context=None):
-        """ Make purchase order from procurement
-        @return: New created Purchase Orders procurement wise
-        """
-        res = {}
-        if context is None:
-            context = {}
-        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-        partner_obj = self.pool.get('res.partner')
-        uom_obj = self.pool.get('product.uom')
-        pricelist_obj = self.pool.get('product.pricelist')
-        prod_obj = self.pool.get('product.product')
-        acc_pos_obj = self.pool.get('account.fiscal.position')
-        for procurement in self.browse(cr, uid, ids, context=context):
-            res_id = procurement.move_id.id
-
-            # partner, seller_qty and seller_delay are computed with hook
-            hook = self.get_partner_hook(cr, uid, ids, context=context, procurement=procurement)
-            partner = hook['partner']
-            seller_qty = hook['seller_qty']
-            seller_delay = hook['seller_delay']
-            partner_id = partner.id
-            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
-            pricelist_id = partner.property_product_pricelist_purchase
-
-            uom_id = procurement.product_id.uom_po_id.id
-
-            qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
-            if seller_qty:
-                qty = max(qty,seller_qty)
-
-            price = pricelist_obj.price_get(cr, uid, [pricelist_id.id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id.id]
-            if hook.get('price_unit', False):
-                price = hook.get('price_unit', False)            
-
-            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
-            newdate = (newdate - relativedelta(days=int(company.po_lead))) - relativedelta(days=int(seller_delay))
-
-            #Passing partner_id to context for purchase order line integrity of Line name
-            context.update({'lang': partner.lang, 'partner_id': partner_id})
-
-            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
-
-            line = {
-                'name': product.partner_ref,
-                'product_qty': qty,
-                'product_id': procurement.product_id.id,
-                'product_uom': uom_id,
-                'price_unit': price,
-                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                'move_dest_id': res_id,
-                'notes': product.description_purchase,
-            }
-
-            # line values modification from hook
-            line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement, pricelist=pricelist_id)
-
-            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
-            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
-            line.update({
-                'taxes_id': [(6,0,taxes)]
-            })
-            values = {
-                'origin': procurement.origin,
-                'partner_id': partner_id,
-                'partner_address_id': address_id,
-                'location_id': procurement.location_id.id,
-                'pricelist_id': pricelist_id.id,
-                'order_line': [(0,0,line)],
-                'company_id': procurement.company_id.id,
-                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
-            }
-            # values modification from hook
-            values = self.po_values_hook(cr, uid, ids, context=context, values=values, procurement=procurement, line=line,)
-            # purchase creation from hook
-            purchase_id = self.create_po_hook(cr, uid, ids, context=context, values=values, procurement=procurement)
-            res[procurement.id] = purchase_id
-            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
-        return res
-
-procurement_order()
 
 class stock_invoice_onshipping(osv.osv_memory):
     _inherit = "stock.invoice.onshipping"

=== modified file 'bin/addons/purchase/purchase_data.xml'
--- bin/addons/purchase/purchase_data.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/purchase/purchase_data.xml	2017-10-02 12:34:11 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-
         <record id="req_link_purchase_order" model="res.request.link">
             <field name="name">Purchase Order</field>
             <field name="object">purchase.order</field>
@@ -37,6 +36,48 @@
             id="purchase_default_set"
             model="ir.values"
             name="set"/>
-        
+    </data>
+
+    <data noupdate="0">
+        <record id="pol_state_cancel" model="purchase.order.line.state">
+            <field name="name">cancel</field>
+            <field name="sequence">1000</field>
+        </record>
+        <record id="pol_state_cancel_r" model="purchase.order.line.state">
+            <field name="name">cancel_r</field>
+            <field name="sequence">1001</field>
+        </record>
+        <record id="pol_state_draft" model="purchase.order.line.state">
+            <field name="name">draft</field>
+            <field name="sequence">10</field>
+        </record>
+        <record id="pol_state_validated_n" model="purchase.order.line.state">
+            <field name="name">validated_n</field>
+            <field name="sequence">15</field>
+        </record>
+        <record id="pol_state_validated" model="purchase.order.line.state">
+            <field name="name">validated</field>
+            <field name="sequence">20</field>
+        </record>
+        <record id="pol_state_sourced_sy" model="purchase.order.line.state">
+            <field name="name">sourced_sy</field>
+            <field name="sequence">40</field>
+        </record>
+        <record id="pol_state_sourced_v" model="purchase.order.line.state">
+            <field name="name">sourced_v</field>
+            <field name="sequence">50</field>
+        </record>
+        <record id="pol_state_sourced_n" model="purchase.order.line.state">
+            <field name="name">sourced_n</field>
+            <field name="sequence">60</field>
+        </record>
+        <record id="pol_state_confirmed" model="purchase.order.line.state">
+            <field name="name">confirmed</field>
+            <field name="sequence">70</field>
+        </record>
+        <record id="pol_state_done" model="purchase.order.line.state">
+            <field name="name">done</field>
+            <field name="sequence">80</field>
+        </record>
     </data>
 </openerp>

=== added file 'bin/addons/purchase/purchase_line.py'
--- bin/addons/purchase/purchase_line.py	1970-01-01 00:00:00 +0000
+++ bin/addons/purchase/purchase_line.py	2017-10-02 12:34:11 +0000
@@ -0,0 +1,1422 @@
+# -*- coding: utf-8 -*-
+
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from osv import osv, fields
+from tools.translate import _
+import decimal_precision as dp
+from purchase_override import PURCHASE_ORDER_STATE_SELECTION, PURCHASE_ORDER_LINE_STATE_SELECTION
+
+
+class purchase_order_line(osv.osv):
+    _table = 'purchase_order_line'
+    _name = 'purchase.order.line'
+    _description = 'Purchase Order Line'
+
+    def _get_vat_ok(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return True if the system configuration VAT management is set to True
+        '''
+        vat_ok = self.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok
+        res = {}
+        for id in ids:
+            res[id] = vat_ok
+
+        return res
+
+    def _amount_line(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        cur_obj = self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids, context=context):
+            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur.rounding, taxes['total'])
+            if line.price_unit > 0 and res[line.id] < 0.01:
+                res[line.id] = 0.01
+        return res
+
+    def _get_price_change_ok(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Returns True if the price can be changed by the user
+        '''
+        res = {}
+
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = True
+            stages = self._get_stages_price(cr, uid, line.product_id.id, line.product_uom.id, line.order_id,
+                                            context=context)
+            if line.merged_id and len(
+                    line.merged_id.order_line_ids) > 1 and line.order_id.state != 'confirmed' and stages and not line.order_id.rfq_ok:
+                res[line.id] = False
+
+        return res
+
+    def _get_fake_state(self, cr, uid, ids, field_name, args, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        ret = {}
+        for pol in self.read(cr, uid, ids, ['state']):
+            ret[pol['id']] = pol['state']
+        return ret
+
+    def _get_fake_id(self, cr, uid, ids, field_name, args, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        ret = {}
+        for pol in self.read(cr, uid, ids, ['id']):
+            ret[pol['id']] = pol['id']
+        return ret
+
+    def _vals_get(self, cr, uid, ids, fields, arg, context=None):
+        '''
+        multi fields function method
+        '''
+        # Some verifications
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        result = {}
+        for obj in self.browse(cr, uid, ids, context=context):
+            # default values
+            result[obj.id] = {'order_state_purchase_order_line': False}
+            # order_state_purchase_order_line
+            if obj.order_id:
+                result[obj.id].update({'order_state_purchase_order_line': obj.order_id.state})
+
+        return result
+
+    def _get_project_po_ref(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the name of the PO at project side
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = dict.fromkeys(ids, '')
+        for line_id in ids:
+            sol_ids = self.get_sol_ids_from_pol_ids(cr, uid, line_id, context=context)
+            for sol in self.pool.get('sale.order.line').browse(cr, uid, sol_ids, context=context):
+                if sol.order_id and sol.order_id.client_order_ref:
+                    if res[line_id]:
+                        res[line_id] += ' - '
+                    res[line_id] += sol.order_id.client_order_ref
+
+        return res
+
+    def _get_link_sol_id(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Return the ID of the first FO line sourced by this PO line
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = dict.fromkeys(ids, False)
+        for line_id in ids:
+            sol_ids = self.get_sol_ids_from_pol_ids(cr, uid, [line_id], context=context)
+            if sol_ids:
+                res[line_id] = sol_ids[0]
+
+        return res
+
+    def _get_customer_ref(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the customer ref from "sale.order".client_order_ref
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        for pol in self.browse(cr, uid, ids, context=context):
+            res[
+                pol.id] = pol.linked_sol_id and pol.linked_sol_id.order_id.client_order_ref or False
+
+        return res
+
+    def _get_state_to_display(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        return the purchase.order.line state to display
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        res = {}
+        for pol in self.browse(cr, uid, ids, context=context):
+            # if PO line has been created from ressourced process, then we display the state as 'Resourced-XXX' (excepted for 'done' status)
+            if pol.resourced_original_line and pol.state != 'done':
+                if pol.state.startswith('validated'):
+                    res[pol.id] = 'Resourced-v'
+                elif pol.state.startswith('sourced'):
+                    if pol.state == 'sourced_v':
+                        res[pol.id] = 'Resourced-pv'
+                    elif pol.state == 'sourced_sy':
+                        res[pol.id] = 'Resourced-sy'
+                    else:
+                        res[pol.id] = 'Resourced-s'
+                elif pol.state.startswith('confirmed'):
+                    res[pol.id] = 'Resourced-c'
+                else: # draft + unexpected PO line state
+                    res[pol.id] = 'Resourced-d'
+            else: # state_to_display == state
+                res[pol.id] = self.pool.get('ir.model.fields').get_browse_selection(cr, uid, pol, 'state', context=context)
+
+        return res
+
+
+    def _get_display_resourced_orig_line(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        return the original PO line (from which the current one has been resourced) formatted as wanted
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        res = {}
+        for pol in self.browse(cr, uid, ids, context=context):
+            res[pol.id] = False
+            if pol.resourced_original_line:
+                res[pol.id] = '%s' % (pol.resourced_original_line.line_number)
+
+        return res
+
+    def _get_stock_take_date(self, cr, uid, context=None):
+        '''
+            Returns stock take date
+        '''
+        if context is None:
+            context = {}
+        order_obj = self.pool.get('purchase.order')
+        res = False
+
+        if context.get('purchase_id', False):
+            po = order_obj.browse(cr, uid, context.get('purchase_id'), context=context)
+            res = po.stock_take_date
+
+        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'),
+        'set_as_validated_n': fields.boolean(string='Created when PO validated', help='Usefull for workflow transition to set the validated-n state'),
+        'is_line_split': fields.boolean(string='This line is a split line?'),
+        'linked_sol_id': fields.many2one('sale.order.line', string='Linked FO line', help='Linked Sale Order line in case of PO line from sourcing', readonly=True),
+        'sync_linked_sol': fields.char(size=256, string='Linked FO line at synchro'),
+        # UTP-972: Use boolean to indicate if the line is a split line
+        'merged_id': fields.many2one('purchase.order.merged.line', string='Merged line'),
+        'origin': fields.char(size=512, string='Origin'),
+        'link_so_id': fields.many2one('sale.order', string='Linked FO/IR', readonly=True),
+        'dpo_received': fields.boolean(string='Is the IN has been received at Project side ?'),
+        'change_price_ok': fields.function(_get_price_change_ok, type='boolean', method=True, string='Price changing'),
+        'change_price_manually': fields.boolean(string='Update price manually'),
+        # openerp bug: eval invisible in p.o use the po line state and not the po state !
+        'fake_state': fields.function(_get_fake_state, type='char', method=True, string='State',
+                                      help='for internal use only'),
+        # openerp bug: id is not given to onchanqge call if we are into one2many view
+        'fake_id': fields.function(_get_fake_id, type='integer', method=True, string='Id',
+                                   help='for internal use only'),
+        'old_price_unit': fields.float(string='Old price',
+                                       digits_compute=dp.get_precision('Purchase Price Computation')),
+        'order_state_purchase_order_line': fields.function(_vals_get, method=True, type='selection',
+                                                           selection=PURCHASE_ORDER_STATE_SELECTION,
+                                                           string='State of Po', multi='get_vals_purchase_override',
+                                                           store=False, readonly=True),
+
+        # This field is used to identify the FO PO line between 2 instances of the sync
+        'sync_order_line_db_id': fields.text(string='Sync order line DB Id', required=False, readonly=True),
+        'external_ref': fields.char(size=256, string='Ext. Ref.'),
+        'project_ref': fields.char(size=256, string='Project Ref.'),
+        'has_to_be_resourced': fields.boolean(string='Has to be re-sourced'),
+        'select_fo': fields.many2one('sale.order', string='FO'),
+        'fnct_project_ref': fields.function(_get_project_po_ref, method=True, string='Project PO',
+                                            type='char', size=128, store=False),
+        'from_fo': fields.boolean(string='From FO', readonly=True),
+        'display_sync_ref': fields.boolean(string='Display sync. ref.'),
+        'instance_sync_order_ref': fields.many2one('sync.order.label', string='Order in sync. instance'),
+        'link_sol_id': fields.function(_get_link_sol_id, method=True, type='many2one', relation='sale.order.line',
+                                       string='Linked FO line', store=False),
+        'soq_updated': fields.boolean(string='SoQ updated', readonly=True),
+        'red_color': fields.boolean(string='Red color'),
+        'customer_ref': fields.function(_get_customer_ref, method=True, type="text", store=False,
+                                        string="Customer ref."),
+        'name': fields.char('Description', size=256, required=True),
+        'product_qty': fields.float('Quantity', required=True, digits=(16, 2)),
+        'date_planned': fields.date('Scheduled Date', required=True, select=True),
+        'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, select=True),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok', '=', True)],
+                                      change_default=True, select=True),
+        'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True,
+                                    ondelete='set null'),
+        'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null', select=True),
+        'price_unit': fields.float('Unit Price', required=True,
+                                   digits_compute=dp.get_precision('Purchase Price Computation')),
+        'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False,
+                                  readonly=True),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',
+                                          digits_compute=dp.get_precision('Purchase Price')),
+        'notes': fields.text('Notes'),
+        'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True,
+                                    ondelete='cascade'),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', ),
+        'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company',
+                                     string='Company', store=True, readonly=True),
+        'state': fields.selection(PURCHASE_ORDER_LINE_STATE_SELECTION, 'State', required=True, readonly=True,
+                                  help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
+                                       \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
+                                       \n* The \'Done\' state is set automatically when purchase order is set as done. \
+                                       \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'),
+        'state_to_display': fields.function(_get_state_to_display, string='State', type='text', method=True, readonly=True,
+            help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
+               \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
+               \n* The \'Done\' state is set automatically when purchase order is set as done. \
+               \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'
+        ),
+        'resourced_original_line': fields.many2one('purchase.order.line', 'Original line', readonly=True, help='Original line from which the current one has been cancel and ressourced'),
+        'display_resourced_orig_line': fields.function(_get_display_resourced_orig_line, method=True, type='char', readonly=True, string='Original PO line', help='Original line from which the current one has been cancel and ressourced'),
+        'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id',
+                                          'invoice_id', 'Invoice Lines', readonly=True),
+        'invoiced': fields.boolean('Invoiced', readonly=True),
+        '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),
+    }
+    _defaults = {
+        'set_as_sourced_n': lambda *a: False,
+        'set_as_validated_n': lambda *a: False,
+        'change_price_manually': lambda *a: False,
+        'product_qty': lambda *a: 0.00,
+        'price_unit': lambda *a: 0.00,
+        'change_price_ok': lambda *a: True,
+        'is_line_split': False,  # UTP-972: by default not a split line
+        'from_fo': lambda self, cr, uid, c: not c.get('rfq_ok', False) and c.get('from_fo', False),
+        'soq_updated': False,
+        'state': lambda *args: 'draft',
+        'invoiced': lambda *a: 0,
+        'vat_ok': lambda obj, cr, uid, context: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
+        'stock_take_date': _get_stock_take_date,
+    }
+
+    def _get_destination_ok(self, cr, uid, lines, context):
+        dest_ok = False
+        for line in lines:
+            is_inkind = line.order_id and line.order_id.order_type == 'in_kind' or False
+            dest_ok = line.account_4_distribution and line.account_4_distribution.destination_ids or False
+            if not dest_ok:
+                if is_inkind:
+                    raise osv.except_osv(_('Error'), _(
+                        'No destination found. An In-kind Donation account is probably missing for this line: %s.') % (
+                        line.name or ''))
+                raise osv.except_osv(_('Error'), _('No destination found for this line: %s.') % (line.name or '',))
+        return dest_ok
+
+    def check_analytic_distribution(self, cr, uid, ids, context=None, create_missing=False):
+        """
+        Check analytic distribution validity for given PO line.
+        Also check that partner have a donation account (is PO is in_kind)
+        """
+        # Objects
+        ad_obj = self.pool.get('analytic.distribution')
+        ccdl_obj = self.pool.get('cost.center.distribution.line')
+        pol_obj = self.pool.get('purchase.order.line')
+        imd_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        try:
+            intermission_cc = imd_obj.get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_project_intermission')[1]
+        except ValueError:
+            intermission_cc = 0
+
+        po_info = {}
+        for pol in self.browse(cr, uid, ids, context=context):
+            po = pol.order_id
+            if po.id not in po_info:
+                donation_intersection = po.order_type in ['donation_exp', 'donation_st'] and po.partner_type and po.partner_type == 'section'
+                if po.order_type == 'in_kind' or donation_intersection:
+                    if not po.partner_id.donation_payable_account:
+                        raise osv.except_osv(_('Error'), _('No donation account on this partner: %s') % (po.partner_id.name or '',))
+
+                if po.partner_id and po.partner_id.partner_type == 'intermission':
+                    if not intermission_cc:
+                        raise osv.except_osv(_('Error'), _('No Intermission Cost Center found!'))
+
+            po_info[po.id] = True
+
+
+            distrib = pol.analytic_distribution_id or po.analytic_distribution_id or False
+
+
+            # Raise an error if no analytic distribution found
+            if not distrib:
+                # UFTP-336: For the case of a new line added from Coordo, it's a push flow, no need to check the AD! VERY SPECIAL CASE
+                if po.order_type not in ('loan', 'donation_st', 'donation_exp', 'in_kind') or po.push_fo:
+                    return True
+                if create_missing and po.partner_id and po.partner_id.partner_type == 'intermission':
+                    # intermission push flow, new line added: AD needed
+                    destination_id = pol.account_4_distribution and pol.account_4_distribution.default_destination_id and pol.account_4_distribution.default_destination_id.id or False
+                    ad_obj.create(cr, uid, {
+                        'purchase_line_ids': [(4, pol.id)],
+                        'cost_center_lines': [(0, 0, {'destination_id': destination_id, 'analytic_id': intermission_cc , 'percentage':'100', 'currency_id': po.currency_id.id})]
+                    })
+                else:
+                    raise osv.except_osv(_('Warning'),
+                                         _('Analytic allocation is mandatory for this line: %s!') % (pol.name or '',))
+
+            elif pol.analytic_distribution_state != 'valid':
+                id_ad = ad_obj.create(cr, uid, {})
+                ad_lines = pol.analytic_distribution_id and pol.analytic_distribution_id.cost_center_lines or po.analytic_distribution_id.cost_center_lines
+                bro_dests = self._get_destination_ok(cr, uid, [pol], context=context)
+                for line in ad_lines:
+                    # fetch compatible destinations then use on of them:
+                    # - destination if compatible
+                    # - else default destination of given account
+                    if line.destination_id in bro_dests:
+                        bro_dest_ok = line.destination_id
+                    else:
+                        bro_dest_ok = pol.account_4_distribution.default_destination_id
+                    # Copy cost center line to the new distribution
+                    ccdl_obj.copy(cr, uid, line.id, {
+                        'distribution_id': id_ad,
+                        'destination_id': bro_dest_ok.id,
+                        'partner_type': po.partner_id.partner_type,
+                    })
+                # Write result
+                pol_obj.write(cr, uid, [pol.id], {'analytic_distribution_id': id_ad})
+            else:
+                ad_lines = pol.analytic_distribution_id and pol.analytic_distribution_id.cost_center_lines or po.analytic_distribution_id.cost_center_lines
+                line_ids_to_write = [line.id for line in ad_lines if not
+                                     line.partner_type]
+                ccdl_obj.write(cr, uid, line_ids_to_write, {
+                    'partner_type': pol.order_id.partner_id.partner_type,
+                })
+
+        return True
+
+    def _hook_product_id_change(self, cr, uid, *args, **kwargs):