Merge lp:~unifield-team/unifield-server/us-574 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-02-19 10:57:13 +0000
+++ bin/addons/sale_override/sale.py	2016-03-17 10:23:08 +0000
@@ -2354,7 +2354,7 @@
         res = super(sale_order_line, self).unlink(cr, uid, ids, context=context)
 
         if lines_to_check:
-            self.check_confirm_order(cr, uid, lines_to_check, context=context)
+            self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, ontext=context)
 
         return res
 

=== modified file 'bin/addons/sourcing/__init__.py'
--- bin/addons/sourcing/__init__.py	2014-03-10 09:56:10 +0000
+++ bin/addons/sourcing/__init__.py	2016-03-17 10:23:08 +0000
@@ -28,5 +28,6 @@
 import purchase_order
 import res_partner
 import sale_order
+import po_automation_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/sourcing/po_automation_config.py'
--- bin/addons/sourcing/po_automation_config.py	1970-01-01 00:00:00 +0000
+++ bin/addons/sourcing/po_automation_config.py	2016-03-17 10:23:08 +0000
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+
+from tools.translate import _
+
+
+class po_automation_config(osv.osv):
+    _name = 'po.automation.config'
+
+    _columns = {
+        'name': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+            ],
+            string='Run scheduler automatically ?',
+            required=True,
+        ),
+    }
+
+    _defaults = {
+        'name': 'yes',
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Check that there is only one PO Automation configuration record
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param vals: Values for the new created record
+        :param context: Context of the call
+        :return: ID of the new po.automation.config record
+        """
+        if context is None:
+            context = {}
+
+        if self.search(cr, uid, [], limit=1, context=context):
+            raise osv.except_osv(
+                _('Error'),
+                _('It is forbidden to have more than one PO Automation configuration record'),
+            )
+
+        return super(po_automation_config, self).create(cr, uid, vals, context=context)
+
+    def save(self, cr, uid, ids, context=None):
+        """
+        Just save the value on the PO Automation configuration record
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of po.automation.config to save
+        :param context: Context of the call
+        :return: True
+        """
+        return True
+
+    def get_po_automation(self, cr, uid, context=None):
+        """
+        Return True if the configuration of the PO Automation is 'Yes', else, return False
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param context: Context of the call
+        :return: True or False
+        """
+        if context is None:
+            context = {}
+
+        conf_ids = self.search(cr, uid, [], limit=1, context=context)
+        for conf in self.browse(cr, uid, conf_ids, context=context):
+            if conf.name == 'no':
+                return False
+
+        return True
+
+po_automation_config()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-01-08 14:11:50 +0000
+++ bin/addons/sourcing/sale_order_line.py	2016-03-17 10:23:08 +0000
@@ -1014,7 +1014,7 @@
 
         return result
 
-    def confirmLine(self, cr, uid, ids, context=None):
+    def confirmLine(self, cr, uid, ids, run_scheduler=False, context=None):
         """
         Set the line as confirmed and check if all lines
         of the FO/IR are confirmed. If yes, launch the
@@ -1023,6 +1023,8 @@
         :param cr: Cursor to the database
         :param uid: ID of the user that runs the method
         :param ids: List of IDs of sale.order.line to check
+        :param run_scheduler: If set to True, after all FO/IR are confirmed,
+                              run the Auto POs creation scheduler
         :param context: Context of the call
 
         :return Raise an error or True
@@ -1030,6 +1032,7 @@
         """
         # Objects
         order_obj = self.pool.get('sale.order')
+        po_auto_obj = self.pool.get('po.automation.config')
 
         if context is None:
             context = {}
@@ -1121,13 +1124,22 @@
                 _('You cannot confirm the sourcing of a line to an internal customer with an internal supplier.'),
             )
 
-        self.check_confirm_order(cr, uid, ids, context=context)
+        if not run_scheduler:
+            run_scheduler = po_auto_obj.get_po_automation(cr, uid, context=context)
+
+        self.check_confirm_order(cr, uid, ids, run_scheduler=run_scheduler, context=context)
 
         return True
 
-    def check_confirm_order(self, cr, uid, ids, context=None):
+    def check_confirm_order(self, cr, uid, ids, run_scheduler=False, context=None):
         """
         Run the confirmation of the FO/IR if all lines are confirmed
+        :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.line to check
+        :param run_scheduler: If set to True, after all FO/IR are confirmed,
+                              run the Auto POs creation scheduler
+        :praam context: Context of the call
         """
         # Objects
         order_obj = self.pool.get('sale.order')
@@ -1198,12 +1210,16 @@
 
                 for order_id in order_ids:
                     self.infolog(cr, uid, "All lines of the FO/IR id:%s have been sourced" % order_id)
-                thread = threading.Thread(target=self.confirmOrder, args=(cr, uid, order_ids, state_to_use, context))
+                thread = threading.Thread(
+                    target=self.confirmOrder,
+                    args=(cr, uid, order_ids, state_to_use, run_scheduler, context)
+                )
                 thread.start()
 
         return True
 
-    def confirmOrder(self, cr, uid, order_ids, state_to_use, context=None, new_cursor=True):
+    def confirmOrder(self, cr, uid, order_ids, state_to_use, run_scheduler=False,
+                     context=None, new_cursor=True):
         """
         Confirm the order specified in the parameter.
 
@@ -1211,6 +1227,8 @@
         :param uid: ID of the user that runs the method
         :param order_id: List of ID of the orders to confirm
         :param state_to_use: Determine if the order is an IR or a FO
+        :param run_scheduler: If set to True, after all FO/IR are confirmed,
+                              run the Auto POs creation scheduler
         :param context: Context of the call
         :param new_cursor: Use a new DB cursor or not
 
@@ -1219,7 +1237,7 @@
         """
         if not context:
             context = {}
-
+        wiz_obj = self.pool.get('procurement.purchase.compute.all')
         wf_service = netsvc.LocalService("workflow")
 
         if new_cursor:
@@ -1263,6 +1281,11 @@
                     'error': misc.ustr(e),
                 }, context=context)
 
+        if run_scheduler:
+            # Run Auto POs creation scheduler
+            wiz_id = wiz_obj.create(cr, uid, {}, context=context)
+            wiz_obj.procure_calculation_purchase(cr, uid, wiz_id, context=context)
+
         if new_cursor:
             cr.commit()
             cr.close(True)

=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml	2014-09-29 12:38:06 +0000
+++ bin/addons/sourcing/sourcing_view.xml	2016-03-17 10:23:08 +0000
@@ -191,7 +191,36 @@
 		    target="new"
             key2="client_action_multi"
             empty_ids="1"
-		    id="action_compute_schedulers_sourcing"/>
+            id="action_compute_schedulers_sourcing"/>
+
+        <!-- PO Automation -->
+        <record id="po_automation_config_data" model="po.automation.config">
+            <field name="name">yes</field>
+        </record>
+
+        <record id="po_automation_config_tree_view" model="ir.ui.view">
+            <field name="name">po.automation.config.tree.view</field>
+            <field name="model">po.automation.config</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="PO Automation configuration" hide_delete_button="True" hide_new_button="True" editable="top">
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_po_automation_config" model="ir.actions.act_window">
+            <field name="name">PO Automation</field>
+            <field name="res_model">po.automation.config</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_action_po_automation_config"
+            action="action_po_automation_config"
+            parent="base.menu_sale_config_sales"
+            name="PO Automation" />
 
 	</data>
 </openerp>

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing.py'
--- bin/addons/sourcing/wizard/multiple_sourcing.py	2015-03-02 20:31:25 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing.py	2016-03-17 10:23:08 +0000
@@ -23,12 +23,13 @@
 from osv import osv
 from tools.translate import _
 
-from sourcing.sale_order_line import _SELECTION_PO_CFT
+from ..sale_order_line import _SELECTION_PO_CFT
 
 _SELECTION_TYPE = [
     ('make_to_stock', 'from stock'),
     ('make_to_order', 'on order'), ]
 
+
 class multiple_sourcing_wizard(osv.osv_memory):
     _name = 'multiple.sourcing.wizard'
 
@@ -40,6 +41,10 @@
             'wizard_id',
             string='Sourcing lines',
         ),
+        'run_scheduler': fields.boolean(
+            string='Run scheduler ?',
+            readonly="True",
+        ),
         'type': fields.selection(
             _SELECTION_TYPE,
             string='Procurement Method',
@@ -71,8 +76,17 @@
     def default_get(self, cr, uid, fields_list, context=None):
         """
         Set lines with the selected lines to source
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param fields_list: List of field names to fill with default value
+        :param context: Context of the call
+        :return: A dictionary that contains the field name as key and the default value for this field as value.
         """
-        if not context:
+        sol_obj = self.pool.get('sale.order.line')
+        user_obj = self.pool.get('res.users')
+        po_auto_cfg_obj = self.pool.get('po.automation.config')
+
+        if context is None:
             context = {}
 
         active_ids = context.get('active_ids')
@@ -81,18 +95,20 @@
 
         res = super(multiple_sourcing_wizard, self).default_get(cr, uid, fields_list, context=context)
 
-        res['line_ids'] = []
-        res['error_on_lines'] = False
+        res.update({
+            'line_ids': [],
+            'error_on_lines': False,
+            'run_scheduler': po_auto_cfg_obj.get_po_automation(cr, uid, context=context),
+            'type': 'make_to_stock',
+            'po_cft': False,
+        })
 
         # Check if all lines are with the same type, then set that type, otherwise set make_to_order
-
-        # Ignore all lines which have already been sourced, if there are some alredy sourced lines, a message
+        # Ignore all lines which have already been sourced, if there are some already sourced lines, a message
         # will be displayed at the top of the wizard
-        res['type'] = 'make_to_stock'
-        res['po_cft'] = False
-        loc = -1 # first location flag
-        supplier = -1 # first location flag
-        for line in self.pool.get('sale.order.line').browse(cr, uid, active_ids, context=context):
+        loc = -1  # first location flag
+        supplier = -1  # first location flag
+        for line in sol_obj.browse(cr, uid, active_ids, context=context):
             if line.state == 'draft' and line.sale_order_state == 'validated':
                 res['line_ids'].append(line.id)
             else:
@@ -102,52 +118,70 @@
                 res['type'] = 'make_to_order'
                 res['po_cft'] = 'po'
 
-                loc = False # always set False for location if source on order
+                loc = False  # always set False for location if source on order
                 if not line.supplier:
                     supplier = False
                 else:
                     temp = line.supplier.id
-                    if supplier == -1: # first location
+                    if supplier == -1:  # first location
                         supplier = temp
                     elif supplier != temp:
                         supplier = False
             else:
-                # UTP-1021: Calculate the location to set into the wizard view if all lines are sourced from the same location
-                supplier = False # if source from stock, always set False to partner
+                # UTP-1021: Calculate the location to set into the wizard view if all lines
+                # are sourced from the same location
+                supplier = False  # if source from stock, always set False to partner
                 temploc = line.location_id.id
-                if loc == -1: # first location
+                if loc == -1:  # first location
                     loc = temploc
                 elif temploc != loc:
                     loc = False
 
-        # UTP-1021: Set default values on openning the wizard
+        # UTP-1021: Set default values on opening the wizard
         if loc != -1:
             res['location_id'] = loc
         if supplier != -1:
             res['supplier_id'] = supplier
 
         if not res['line_ids']:
-            raise osv.except_osv(_('Error'), _('No non-sourced lines are selected. Please select non-sourced lines'))
+            raise osv.except_osv(
+                _('Error'),
+                _('No non-sourced lines are selected. Please select non-sourced lines'),
+            )
 
-        res['company_id'] = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        res['company_id'] = user_obj.browse(cr, uid, uid, context=context).company_id.id
 
         return res
 
     def save_lines(self, cr, uid, ids, context=None):
-        '''
-        Set values to sourcing lines
-        '''
-        if not context:
+        """
+        Set values defined on the wizard to the lines of the wizard.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of multiple.sourcing.wizard to save
+        :param context: Context of the call
+        :return: Close the wizard window
+        """
+        line_obj = self.pool.get('sale.order.line')
+
+        if context is None:
             context = {}
 
-        line_obj = self.pool.get('sale.order.line')
+        if isinstance(ids, (int, long)):
+            ids = [ids]
 
         for wiz in self.browse(cr, uid, ids, context=context):
             if wiz.type == 'make_to_order':
                 if not wiz.po_cft:
-                    raise osv.except_osv(_('Error'), _('The Procurement method should be filled !'))
+                    raise osv.except_osv(
+                        _('Error'),
+                        _('The Procurement method should be filled !'),
+                    )
                 elif wiz.po_cft != 'cft' and not wiz.supplier_id:
-                    raise osv.except_osv(_('Error'), _('You should select a supplier !'))
+                    raise osv.except_osv(
+                        _('Error'),
+                        _('You should select a supplier !'),
+                    )
 
             errors = {}
             for line in wiz.line_ids:
@@ -157,11 +191,12 @@
                     errors[err_msg].append((line.id, '%s of %s' % (line.line_number, line.order_id.name)))
                 else:
                     try:
-                        line_obj.write(cr, uid, [line.id], {'type': wiz.type,
-                                                            'po_cft': wiz.po_cft,
-                                                            'supplier': wiz.supplier_id and wiz.supplier_id.id or False,
-                                                            'location_id': wiz.location_id.id and wiz.location_id.id or False},
-                                                             context=context)
+                        line_obj.write(cr, uid, [line.id], {
+                            'type': wiz.type,
+                            'po_cft': wiz.po_cft,
+                            'supplier': wiz.supplier_id and wiz.supplier_id.id or False,
+                            'location_id': wiz.location_id.id and wiz.location_id.id or False,
+                        }, context=context)
                     except osv.except_osv, e:
                         errors.setdefault(e.value, [])
                         errors[e.value].append((line.id, '%s of %s' % (line.line_number, line.order_id.name)))
@@ -184,35 +219,52 @@
         return {'type': 'ir.actions.act_window_close'}
 
     def source_lines(self, cr, uid, ids, context=None):
-        '''
-        Confirm all lines
-        '''
+        """
+        Confirm the sourcing of all the sale.order.line contained in the wizards.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of multiple.sourcing.wizard that contain lines to confirm
+        :param context: Context of the call
+        :return: Close the wizard window
+        """
         # Objects
         line_obj = self.pool.get('sale.order.line')
+        po_auto_cfg_obj = self.pool.get('po.automation.config')
 
-        if not context:
+        if context is None:
             context = {}
 
         if isinstance(ids, (int, long)):
             ids = [ids]
 
         lines_to_confirm = []
+        run_scheduler = True
 
         for wiz in self.browse(cr, uid, ids, context=context):
+            if wiz.run_scheduler:
+                run_scheduler = wiz.run_scheduler
+            else:
+                run_scheduler = po_auto_cfg_obj.get_po_automation(cr, uid, context=context)
             for line in wiz.line_ids:
                 if line.order_id.procurement_request and wiz.po_cft == 'dpo':
-                    raise osv.except_osv(_('Error'), _('You cannot choose Direct Purchase Order as method to source Internal Request lines.'))
+                    raise osv.except_osv(_('Error'), _(
+                        'You cannot choose Direct Purchase Order as method to source Internal Request lines.'))
                 lines_to_confirm.append(line.id)
 
-        line_obj.confirmLine(cr, uid, lines_to_confirm, context=context)
+        line_obj.confirmLine(cr, uid, lines_to_confirm, run_scheduler=run_scheduler, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 
     def save_source_lines(self, cr, uid, ids, context=None):
-        '''
-        Set values to sourcing lines and confirm them
-        '''
-        if not context:
+        """
+        Set values on sale.order.lines of the wizard and confirm them
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of multiple.sourcing.wizard that contain the lines to save and confirmed
+        :param context: Context of the call
+        :return: Close the wizard window
+        """
+        if context is None:
             context = {}
 
         self.save_lines(cr, uid, ids, context=context)
@@ -221,9 +273,22 @@
         return {'type': 'ir.actions.act_window_close'}
 
     def change_type(self, cr, uid, ids, l_type, context=None):
-        '''
+        """
         Unset the other fields if the type is 'from stock'
-        '''
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of multiple.sourcing.wizard on which field values has to be changed
+        :param l_type: Value of the field 'type'
+        :param context: Context of the call
+        :return: A dictionary that contains the field names to change as keys and the value for these fields as values.
+        """
+        global stock_loc
+        wh_obj = self.pool.get('stock.warehouse')
+        sol_obj = self.pool.get('sale.order.line')
+
+        if context is None:
+            context = {}
+
         if l_type == 'make_to_order':
             return {'value': {'location_id': False}}
 
@@ -237,37 +302,53 @@
         if not active_ids:
             return res
 
-        wh_obj = self.pool.get('stock.warehouse')
+        # Get the default stock location of the default warehouse
         wh_ids = wh_obj.search(cr, uid, [], context=context)
+        stock_loc = False
         if wh_ids:
             stock_loc = wh_obj.browse(cr, uid, wh_ids[0], context=context).lot_stock_id.id
 
         all_line_empty = True
-        for line in self.pool.get('sale.order.line').browse(cr, uid, active_ids, context=context):
+        for line in sol_obj.browse(cr, uid, active_ids, context=context):
             if line.location_id and line.location_id.id != stock_loc:
                 all_line_empty = False
 
-        if all_line_empty: # by default, and if all lines has no location, then set by default Stock
+        if all_line_empty:  # by default, and if all lines has no location, then set by default Stock
             return {'value': {'po_cft': False, 'supplier_id': False, 'location_id': stock_loc}}
+
         return {'value': {'po_cft': False, 'supplier_id': False}}
 
     def change_po_cft(self, cr, uid, ids, po_cft, context=None):
-        '''
-        Unset the supplier if tender is choosen
-        '''
+        """
+        Unset the supplier if tender is choose
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of multiple.sourcing.wizard on which field values has to be changed
+        :param po_cft: Value of the field 'po_cft'
+        :param context: Context of the call
+        :return: A dictionary that contains the field names to change as keys and the value for these fields as values.
+        """
         if po_cft == 'cft':
             return {'value': {'supplier_id': False}}
 
         return {}
 
     def change_supplier(self, cr, uid, ids, supplier, context=None):
-        '''
+        """
         Check if the partner has an address.
-        '''
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of multiple.sourcing.wizard on which field values has to be changed
+        :param supplier: Value of the field 'supplier_id'
+        :param context: Context of the call
+        :return: A dictionary that contains the field names to change as keys and the value for these fields as values.
+        """
         partner_obj = self.pool.get('res.partner')
 
+        if context is None:
+            context = {}
+
         result = {}
-
         if supplier:
             partner = partner_obj.browse(cr, uid, supplier, context)
             # Check if the partner has addresses
@@ -279,28 +360,42 @@
         return result
 
     def change_location(self, cr, uid, ids, location_id, line_ids, context=None):
-        res = {'value': {}}
-        if not location_id:
-            return res
-
-        if not line_ids or not line_ids[0] or not line_ids[0][2]:
-            return res
-
+        """
+        Update the stock value of lines according to given location.
+        :param cr: Cursor to the database
+        :param uid: ID of the user that calls this method
+        :param ids: List of ID of multiple.sourcing.wizard that contain lines to change
+        :param location_id: ID of stock.location selected in the wizard
+        :param line_ids: List of ID of sale.order.line contained in the multiple.sourcing.wizard
+        :param context: Context of the call
+        :return: A dictionary that contains the field names to change as keys and the value for these fields as values.
+        """
         line_obj = self.pool.get('sale.order.line')
+
+        res = {}
+        if not location_id or not line_ids or not line_ids[0] or not line_ids[0][2]:
+            return res
+
         active_ids = line_ids[0][2]
 
-        context = {}
-        context.update({'from_multiple_line_sourcing': False})
-        for line in self.pool.get('sale.order.line').browse(cr, uid, active_ids, context=context):
-            line_obj.write(cr, uid, [line.id], {'type': 'make_to_stock',
-                                                        'po_cft': False,
-                                                        'supplier': False,
-                                                        'location_id': location_id}, # UTP-1021: Update loc and ask the view to refresh
-                                                         context=context)
-        res = {'value':
-               {'line_ids': active_ids, 'error_on_lines': False, 'po_cft':False,}}
-        return res
+        context = {
+            'from_multiple_line_sourcing': False
+        }
+        for line in line_obj.browse(cr, uid, active_ids, context=context):
+            line_obj.write(cr, uid, [line.id], {
+                'type': 'make_to_stock',
+                'po_cft': False,
+                'supplier': False,
+                'location_id': location_id,
+            }, context=context)  # UTP-1021: Update loc and ask the view to refresh
 
+        return {
+            'value': {
+                'line_ids': active_ids,
+                'error_on_lines': False,
+                'po_cft': False,
+            },
+        }
 
 multiple_sourcing_wizard()
 

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing_view.xml'
--- bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2015-03-02 20:31:25 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2016-03-17 10:23:08 +0000
@@ -21,20 +21,20 @@
                                on_change="change_type(type)"/>
                         <field name="po_cft" attrs="{'readonly': [('type', '=', 'make_to_stock')]}"
                                on_change="change_po_cft(po_cft)"/>
+                        <field name="run_scheduler" />
                         <separator colspan="4" string="Supplier selection" />
                         <field name="supplier_id"
                                domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft), ('line_contains_fo', '=', line_ids)]"
                                attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), ('type', '=', 'make_to_stock')]}"
                                on_change="change_supplier(supplier_id)"
                         />
-
-
-                   <field name="location_id"  domain="[('usage', '=', 'internal'), ('quarantine_location', '=', False), 
-                                                      ('scrap_location', '=', False), ('destruction_location', '=', False), 
-                                                      ('output_ok', '=', False), ('input_ok', '=', False)]" 
-                                                      attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
-                              on_change="change_location(location_id, line_ids)" />
-
+                        <field name="location_id"
+                               domain="[('usage', '=', 'internal'), ('quarantine_location', '=', False),
+                                        ('scrap_location', '=', False), ('destruction_location', '=', False),
+                                        ('output_ok', '=', False), ('input_ok', '=', False)]"
+                               attrs="{'readonly': [('type', '!=', 'make_to_stock')]}"
+                               on_change="change_location(location_id, line_ids)"
+                        />
                     </group>
                     <separator colspan="4" string="Actions" />
                     <button special="cancel" string="Cancel" icon="gtk-cancel" help="Close the wizard" />

=== modified file 'bin/addons/unifield_tests/tests/resourcing.py'
--- bin/addons/unifield_tests/tests/resourcing.py	2015-08-07 03:28:33 +0000
+++ bin/addons/unifield_tests/tests/resourcing.py	2016-03-17 10:23:08 +0000
@@ -255,7 +255,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(db, 'ext_supplier_1'),
         })
-        self.order_line_obj.confirmLine(line_ids)
+        self.order_line_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         new_order_id = self.run_auto_pos_creation(db, order_to_check=order_id)

=== modified file 'bin/addons/unifield_tests/tests/test_pick_convert_to_standard.py'
--- bin/addons/unifield_tests/tests/test_pick_convert_to_standard.py	2015-09-04 15:17:57 +0000
+++ bin/addons/unifield_tests/tests/test_pick_convert_to_standard.py	2016-03-17 10:23:08 +0000
@@ -95,7 +95,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(self.c1, 'ext_supplier_1'),
         })
-        self.c_sol_obj.confirmLine(line_ids)
+        self.c_sol_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         self.c_so_id = self.run_auto_pos_creation(self.c1, order_to_check=self.c_so_id)

=== modified file 'bin/addons/unifield_tests/tests/test_sync_cancel_in.py'
--- bin/addons/unifield_tests/tests/test_sync_cancel_in.py	2015-11-16 08:28:07 +0000
+++ bin/addons/unifield_tests/tests/test_sync_cancel_in.py	2016-03-17 10:23:08 +0000
@@ -113,7 +113,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(self.c1, 'ext_supplier_1'),
         })
-        self.c_sol_obj.confirmLine(line_ids)
+        self.c_sol_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         self.c_so_id = self.run_auto_pos_creation(self.c1, order_to_check=self.c_so_id)

=== modified file 'bin/addons/unifield_tests/tests/test_uf_2490_one_rfq.py'
--- bin/addons/unifield_tests/tests/test_uf_2490_one_rfq.py	2015-03-03 09:45:59 +0000
+++ bin/addons/unifield_tests/tests/test_uf_2490_one_rfq.py	2016-03-17 10:23:08 +0000
@@ -50,7 +50,7 @@
             'po_cft': 'rfq',
             'supplier': self.get_record(db, 'ext_supplier_1'),
         })
-        self.order_line_obj.confirmLine(line_ids)
+        self.order_line_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         new_order_id = self.run_auto_pos_creation(db, order_to_check=order_id)

=== modified file 'bin/addons/unifield_tests/tests/test_uftp_324.py'
--- bin/addons/unifield_tests/tests/test_uftp_324.py	2015-03-12 12:51:33 +0000
+++ bin/addons/unifield_tests/tests/test_uftp_324.py	2016-03-17 10:23:08 +0000
@@ -130,7 +130,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(self.c1, 'ext_supplier_1'),
         })
-        self.c_sol_obj.confirmLine(line_ids)
+        self.c_sol_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         self.c_so_id = self.run_auto_pos_creation(self.c1, order_to_check=self.c_so_id)

=== modified file 'bin/addons/unifield_tests/tests/test_uftp_326.py'
--- bin/addons/unifield_tests/tests/test_uftp_326.py	2015-10-08 15:57:20 +0000
+++ bin/addons/unifield_tests/tests/test_uftp_326.py	2016-03-17 10:23:08 +0000
@@ -99,7 +99,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(self.c1, 'ext_supplier_1'),
         })
-        self.c_sol_obj.confirmLine(line_ids)
+        self.c_sol_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         self.c_so_id = self.run_auto_pos_creation(self.c1, order_to_check=self.c_so_id)

=== modified file 'bin/addons/unifield_tests/tests/test_us_311.py'
--- bin/addons/unifield_tests/tests/test_us_311.py	2015-07-22 13:02:02 +0000
+++ bin/addons/unifield_tests/tests/test_us_311.py	2016-03-17 10:23:08 +0000
@@ -108,7 +108,7 @@
             'po_cft': 'po',
             'supplier': self.p_crd_id,
         })
-        self.p_sol_obj.confirmLine([self.p_irl1_id, self.p_irl2_id])
+        self.p_sol_obj.confirmLine([self.p_irl1_id, self.p_irl2_id], run_scheduler=False)
 
         # Run the scheduler
         self.p_ir_id = self.run_auto_pos_creation(self.p1, order_to_check=self.p_ir_id)
@@ -170,7 +170,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(self.c1, 'ext_supplier_1'),
         })
-        self.c_sol_obj.confirmLine(line_ids)
+        self.c_sol_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Get the generated PO
         self.c_fo_id = self.run_auto_pos_creation(self.c1, order_to_check=self.c_fo_id)

=== modified file 'bin/addons/unifield_tests/tests/test_utp_1007.py'
--- bin/addons/unifield_tests/tests/test_utp_1007.py	2015-02-10 08:55:45 +0000
+++ bin/addons/unifield_tests/tests/test_utp_1007.py	2016-03-17 10:23:08 +0000
@@ -69,7 +69,7 @@
             'po_cft': 'po',
             'supplier': self.get_record(self.c1, 'ext_supplier_1'),
         })
-        self.c_sol_obj.confirmLine(line_ids)
+        self.c_sol_obj.confirmLine(line_ids, run_scheduler=False)
 
         # Run the scheduler
         self.c_so_id = self.run_auto_pos_creation(self.c1, order_to_check=self.c_so_id)