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

[jftempo]

=== modified file 'bin/addons/msf_custom_settings/view/purchase_view.xml'
--- bin/addons/msf_custom_settings/view/purchase_view.xml	2016-03-14 10:56:12 +0000
+++ bin/addons/msf_custom_settings/view/purchase_view.xml	2016-05-18 10:13:49 +0000
@@ -34,7 +34,7 @@
                             <field name="po_from_fo" invisible="1" />
                             <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}),  ('check_partner_rfq', '=', tender_id), ('partner_not_int', 'in', {'type':'po', 'ids':[active_id]})]"
+                                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'])]}" />
                             <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'])]}"/>

=== 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	2016-04-12 12:42:49 +0000
+++ bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml	2016-05-18 10:13:49 +0000
@@ -31,6 +31,8 @@
                     <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">

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2016-01-04 13:16:43 +0000
+++ bin/addons/msf_partner/partner.py	2016-05-18 10:13:49 +0000
@@ -192,6 +192,13 @@
     _columns = {
         'manufacturer': fields.boolean(string='Manufacturer', help='Check this box if the partner is a manufacturer'),
         'partner_type': fields.selection(PARTNER_TYPE, string='Partner type', required=True),
+        'split_po': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+            ],
+            string='Split PO ?',
+        ),
         'in_product': fields.function(_set_in_product, fnct_search=search_in_product, string='In product', type="boolean", readonly=True, method=True, multi='in_product'),
         'min_qty': fields.function(_set_in_product, string='Min. Qty', type='char', readonly=True, method=True, multi='in_product'),
         'delay': fields.function(_set_in_product, string='Delivery Lead time', type='char', readonly=True, method=True, multi='in_product'),
@@ -247,6 +254,7 @@
         'manufacturer': lambda *a: False,
         'transporter': lambda *a: False,
         'partner_type': lambda *a: 'external',
+        'split_po': lambda *a: False,
         'vat_ok': lambda obj, cr, uid, c: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
     }
 

=== modified file 'bin/addons/partner_modification/partner_modification_view.xml'
--- bin/addons/partner_modification/partner_modification_view.xml	2012-09-12 14:01:30 +0000
+++ bin/addons/partner_modification/partner_modification_view.xml	2016-05-18 10:13:49 +0000
@@ -31,6 +31,7 @@
 					<field name="lang" position="after">
 						<field name="zone" />
 						<field name="po_by_project" attrs="{'invisible': [('supplier', '=', False)], 'required': [('supplier', '!=', False)]}" />
+						<field name="split_po" attrs="{'invisible': [('partner_type', '!=', 'esc')], 'required': [('partner_type', '=', 'esc')]}" />
 					</field>
 					<field name="user_id" position="replace"></field>
 					<!-- <field name="leadtime" position="replace"></field> -->

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-05-12 12:09:25 +0000
+++ bin/addons/purchase_override/purchase.py	2016-05-18 10:13:49 +0000
@@ -168,6 +168,8 @@
 
         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)
 

=== modified file 'bin/addons/purchase_override/purchase_view.xml'
--- bin/addons/purchase_override/purchase_view.xml	2015-12-07 15:40:55 +0000
+++ bin/addons/purchase_override/purchase_view.xml	2016-05-18 10:13:49 +0000
@@ -379,6 +379,7 @@
                         <html colspan="4">
                             <p>All information of the PO template will be written in the new PO,</p>
                             <p>except the Delivery Requested date which will be the earliest date of all POs.</p>
+                            <p>Any sourcing group will be lost.</p>
                         </html>
                         <newline />
                         <group colspan="4" col="4" attrs="{'invisible': [('unmatched_categ', '=', False)]}">

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-04-25 09:24:04 +0000
+++ bin/addons/sale_override/sale.py	2016-05-18 10:13:49 +0000
@@ -2277,6 +2277,17 @@
 
         return True
 
+    def _get_related_sourcing_id(self, line):
+        """
+        Return the ID of the related.sourcing document if any
+        :param line: browse_record of FO/IR line
+        :return: ID of a related.sourcing record or False
+        """
+        if line.related_sourcing_ok and line.related_sourcing_id:
+            return line.related_sourcing_id.id
+
+        return False
+
     def _get_procurement_order_data(self, line, order, rts_date, context=None):
         """
         Get data for the  procurement order creation according to
@@ -2315,6 +2326,7 @@
             'company_id': order.company_id.id,
             'supplier': line.supplier and line.supplier.id or False,
             'po_cft': line.po_cft or False,
+            'related_sourcing_id': self._get_related_sourcing_id(line),
             'date_planned': rts_date,
             'from_yml_test': order.from_yml_test,
             'so_back_update_dest_po_id_procurement_order': line.so_back_update_dest_po_id_sale_order_line.id,

=== modified file 'bin/addons/sourcing/__init__.py'
--- bin/addons/sourcing/__init__.py	2016-03-15 09:50:06 +0000
+++ bin/addons/sourcing/__init__.py	2016-05-18 10:13:49 +0000
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import related_sourcing
 import sale_order_line
 import wizard
 

=== modified file 'bin/addons/sourcing/__openerp__.py'
--- bin/addons/sourcing/__openerp__.py	2014-03-14 08:17:52 +0000
+++ bin/addons/sourcing/__openerp__.py	2016-05-18 10:13:49 +0000
@@ -50,6 +50,7 @@
         ],
     'update_xml': [
         'sourcing_view.xml',
+        'related_sourcing_view.xml',
         'wizard/multiple_sourcing_view.xml',
     ],
     'installable': True,

=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2016-04-25 09:24:04 +0000
+++ bin/addons/sourcing/procurement_order.py	2016-05-18 10:13:49 +0000
@@ -68,6 +68,10 @@
     _columns = {
         'supplier': fields.many2one('res.partner', 'Supplier'),
         'po_cft': fields.selection(_SELECTION_PO_CFT, string="PO/CFT"),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Group',
+        ),
         'unique_rule_type': fields.char(
             size=128,
             string='Unique Replenishment rule type',
@@ -86,6 +90,9 @@
         if not default_values.get('from_splitted_po_line'):
             default_values['from_splitted_po_line'] = False
 
+        if not default_values.get('related_sourcing_id'):
+            default_values['related_sourcing_id'] = False
+
         return super(procurement_order, self).copy_data(cr, uid, copy_id, default_values, context=context)
 
     def po_line_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
@@ -206,6 +213,13 @@
         else:
             purchase_domain.append(('order_type', '!=', 'direct'))
 
+        if procurement.related_sourcing_id:
+            purchase_domain.append(('related_sourcing_id', '=', procurement.related_sourcing_id.id))
+            values['related_sourcing_id'] = procurement.related_sourcing_id.id
+        else:
+            purchase_domain.append(('related_sourcing_id', '=', False))
+            values['related_sourcing_id'] = False
+
         if procurement.tender_line_id and procurement.tender_line_id.purchase_order_line_id:
             purchase_domain.append(('pricelist_id', '=', procurement.tender_line_id.purchase_order_line_id.order_id.pricelist_id.id))
         elif procurement.rfq_id:

=== modified file 'bin/addons/sourcing/purchase_order.py'
--- bin/addons/sourcing/purchase_order.py	2014-10-02 20:13:13 +0000
+++ bin/addons/sourcing/purchase_order.py	2016-05-18 10:13:49 +0000
@@ -51,6 +51,11 @@
             string='PO from replenishment rules',
             readonly=True,
         ),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Sourcing group',
+            readonly=True,
+        ),
     }
 
     _defaults = {

=== added file 'bin/addons/sourcing/related_sourcing.py'
--- bin/addons/sourcing/related_sourcing.py	1970-01-01 00:00:00 +0000
+++ bin/addons/sourcing/related_sourcing.py	2016-05-18 10:13:49 +0000
@@ -0,0 +1,68 @@
+# -*- 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
+
+import string
+
+
+class related_sourcing(osv.osv):
+    """
+    This object is used to link sourcing lines on a same PO to the same
+    supplier. If most sourcing lines are sourced to the same supplier but
+    have different related.sourcing, one PO per related.sourcing will be
+    created with all lines linked to this related.sourcing.
+    """
+    _name = 'related.sourcing'
+    _description = 'Sourcing group'
+
+    _columns = {
+        'name': fields.char(
+            size=128,
+            string='Name',
+            required=True,
+        ),
+        'description': fields.text(
+            string='Description',
+        ),
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Format the name value
+        """
+        vals['name'] = filter(str.isalnum, vals.get('name', '')).upper()
+        return super(related_sourcing, self).\
+            create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Format the name value
+        """
+        vals['name'] = filter(str.isalnum, vals.get('name', '')).upper()
+        return super(related_sourcing, self).\
+            write(cr, uid, ids, vals, context=context)
+
+related_sourcing()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/sourcing/related_sourcing_view.xml'
--- bin/addons/sourcing/related_sourcing_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/sourcing/related_sourcing_view.xml	2016-05-18 10:13:49 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="related_sourcing_tree_view" model="ir.ui.view">
+            <field name="name">related.sourcing.tree.view</field>
+            <field name="model">related.sourcing</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sourcing groups" editable="top">
+                    <field name="name" />
+                    <field name="description" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="related_sourcing_action" model="ir.actions.act_window">
+            <field name="name">Sourcing groups</field>
+            <field name="res_model">related.sourcing</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="related_sourcing_menu"
+            action="related_sourcing_action"
+            parent="base.menu_sale_config_sales" />
+
+    </data>
+</openerp>

=== modified file 'bin/addons/sourcing/res_partner.py'
--- bin/addons/sourcing/res_partner.py	2014-03-10 14:11:36 +0000
+++ bin/addons/sourcing/res_partner.py	2016-05-18 10:13:49 +0000
@@ -151,6 +151,9 @@
                    or not isinstance(arg[2]['partner_id'], (int, long)):
                     raise osv.except_osv(_('Error'), _('Filter check_partner_po different than (arg[0], =, %s) not implemented.') % arg[2])
                 order_type = arg[2]['order_type']
+                split_po = arg[2]['split_po']
+                if split_po:
+                    newargs.append(('split_po', '=', 'yes'))
                 # Added by UF-1660 to filter partners
                 # do nothing on partner_type for loan
                 p_list = []

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-04-25 09:24:04 +0000
+++ bin/addons/sourcing/sale_order_line.py	2016-05-18 10:13:49 +0000
@@ -77,17 +77,49 @@
 
         return True
 
+    def _get_supplier(self, cr, uid, ids, context=None):
+        """
+        Returns a list of sale.order.line ID 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 res.partner
+        :param context: Context of the call
+        :return: List of sale.order.line ID to update
+        """
+        return self.pool.get('sale.order.line').search(cr, uid, [
+            ('supplier', 'in', ids),
+            ('state', '=', 'draft'),
+        ], context=context)
+
+    def _check_related_sourcing_ok(self, cr, uid, supplier=False, l_type='make_to_order', context=None):
+        """
+        Return True if the supplier allows split PO.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param supplier: ID of the res.partner selected as supplier for the sale.order.line
+        :param l_type: Procurement method selected for the sale.order.line
+        :param context: Context of the call
+        :return: True or False
+        """
+        if not supplier:
+            return False
+
+        sup_rec = self.pool.get('res.partner').\
+            read(cr, uid, [supplier], ['partner_type', 'split_po'], context=context)[0]
+
+        return l_type == 'make_to_order' and sup_rec['partner_type'] == 'esc' and sup_rec['split_po'] == 'yes'
+
     """
     Methods to get fields.function values
     """
-    def _get_fake(self, cr, uid, ids, field_name, args, context=None):
+    def _get_fake(self, cr, uid, idsrelated_sourcing_ok, field_name, args, context=None):
         """
         Returns False for each ID.
 
         :param cr: Cursor to the database
         :param uid: ID of the user that runs the method
         :param ids: List of ID of field order lines to re-compute
-        :param field_name: A field or a list of fields to be computed
+        :param field_name: A fOield or a list of fields to be computed
         :param args: Some other arguments
         :param context: Context of the call
 
@@ -152,6 +184,7 @@
                                               uid,
                                               [line.id],
                                               line.supplier.id,
+                                              line.type,
                                               context=context)
             res = get_delay.get('value', {}).get('estimated_delivery_date', False)
 
@@ -404,6 +437,30 @@
             ('sale_order_state', '=', 'validated'),
         ]
 
+    def _get_related_sourcing_ok(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Return True or False to determine if the user could select a sourcing group on the OST for the line
+        :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.line to compute
+        :param field_name: Name of the fields to compute
+        :param args: Extra parameters
+        :param context: Context of the call
+        :return: True or False
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = self._check_related_sourcing_ok(cr, uid, line.supplier.id, line.type, context=context)
+
+        return res
+
     _columns = {
         'customer': fields.related(
             'order_id',
@@ -419,6 +476,10 @@
             'res.partner',
             'Supplier',
         ),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Group',
+        ),
         'location_id': fields.many2one(
             'stock.location',
             string='Location',
@@ -517,7 +578,18 @@
             method=True,
             type='boolean',
             string='Order in progress',
-            multi='line_info'),
+            multi='line_info',
+        ),
+        'related_sourcing_ok': fields.function(
+            _get_related_sourcing_ok,
+            method=True,
+            type='boolean',
+            string='Related sourcing OK',
+            store={
+                'sale.order.line': (lambda obj, cr, uid, ids, c={}: ids, ['supplier', 'type'], 10),
+                'res.partner': (_get_supplier, ['partner_type', 'split_po'], 20),
+            },
+        ),
         # UTP-965 : Select a source stock location for line in make to stock
         'real_stock': fields.function(
             _getVirtualStock,
@@ -994,6 +1066,13 @@
         if vals.get('type', False) == 'make_to_order':
             vals['location_id'] = False
 
+        if vals.get('type') == 'make_to_stock':
+            vals['related_sourcing_id'] = False
+        elif vals.get('supplier'):
+            related_sourcing_ok = self._check_related_sourcing_ok(cr, uid, vals.get('supplier'), vals.get('type'), context=context)
+            if not related_sourcing_ok:
+                vals['related_sourcing_id'] = False
+
         # UFTP-139: if make_to_stock and no location, put Stock as location
         if ids and 'type' in vals and  vals.get('type', False) == 'make_to_stock' and not vals.get('location_id', False):
             # Define Stock as location_id for each line without location_id
@@ -1518,7 +1597,7 @@
 
         return res
 
-    def onChangeType(self, cr, uid, line_id, l_type, location_id=False, context=None):
+    def onChangeType(self, cr, uid, line_id, l_type, location_id=False, supplier=False, context=None):
         """
         When the method of procurement is changed, check if the new
         values are compatible with the other values of the line and of the order.
@@ -1528,6 +1607,7 @@
         :param line_id: ID of the line to check
         :param l_type: Value of the procurement method
         :param location_id: ID of the stock location of the line
+        :param supplier: Id of the res.partner selected as partner for the line
         :param context: Context of the change
 
         :return A dictionary with the new values
@@ -1562,7 +1642,11 @@
                 if wh_ids:
                     value['location_id'] = wh_obj.browse(cr, uid, wh_ids[0], context=context).lot_stock_id.id
 
-            value['po_cft'] = False
+            value.update({
+                'po_cft': False,
+                'related_sourcing_ok': False,
+                'related_sourcing_id': False,
+            })
 
             res = {'value': value, 'warning': message}
             if line_id:
@@ -1585,10 +1669,15 @@
 
                     if error:
                         return res
+        else:
+            related_sourcing_ok = self._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context)
+            value['related_sourcing_ok'] = related_sourcing_ok
+            if not related_sourcing_ok:
+                value['related_sourcing_id'] = False
 
         return {'value': value, 'warning': message}
 
-    def onChangeSupplier(self, cr, uid, line_id, supplier, context=None):
+    def onChangeSupplier(self, cr, uid, line_id, supplier, l_type, context=None):
         """
         When the supplier is changed, check if the new values are compatible
         with the other values of the line and of the order.
@@ -1597,6 +1686,7 @@
         :param uid: ID of the user that runs the method
         :param line_id: ID of the line to check
         :param supplier: ID of the current or new choosen supplier
+        :param l_type: Mode of procurement for the line
         :param context: Context of the change
 
         :return A dictionary with the new values
@@ -1618,6 +1708,10 @@
         }
 
         if not supplier:
+            result['value'].update({
+                'related_sourcing_id': False,
+                'related_sourcing_ok': False,
+            })
             sl = self.browse(cr, uid, line_id, context=context)
             if not sl.product_id and sl.order_id.procurement_request and sl.type == 'make_to_order':
                 result['domain']['supplier'] = [('partner_type', 'in', ['internal', 'section', 'intermission'])]
@@ -1638,7 +1732,13 @@
 
         estDeliveryDate = date.today() + relativedelta(days=int(delay))
 
-        result['value']['estimated_delivery_date'] = estDeliveryDate.strftime('%Y-%m-%d')
+        related_sourcing_ok = self._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context)
+        result['value'].update({
+            'estimated_delivery_date': estDeliveryDate.strftime('%Y-%m-%d'),
+            'related_sourcing_ok': related_sourcing_ok,
+        })
+        if not related_sourcing_ok:
+            result['value']['related_sourcing_id'] = False
 
         value = result['value']
         partner_id = 'supplier' in value and value['supplier'] or supplier

=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml	2016-03-15 09:50:06 +0000
+++ bin/addons/sourcing/sourcing_view.xml	2016-05-18 10:13:49 +0000
@@ -93,11 +93,14 @@
                     <button name="open_split_wizard" type="object" string="Split line" icon="terp-stock_effects-object-colorize" 
 						attrs="{'invisible': [('display_confirm_button', '=', False)]}" />
 					<field name="rts" readonly="True" />
-					<field name="type" string="Proc. Method" on_change="onChangeType(type, location_id)" 
+					<field name="type" string="Proc. Method" on_change="onChangeType(type, location_id, supplier)"
 						attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('loan_type', '=', True)]}" />
 					<field name="po_cft"
 					    on_change="onChangePoCft(po_cft, order_id, supplier)" 
                         attrs="{'readonly': ['|', ('type', '=', 'make_to_stock'), ('state', '!=', 'draft')], 'required': [('type', '=', 'make_to_order')]}" />
+					<field name="related_sourcing_ok" invisible="1" />
+                    <field name="related_sourcing_id"
+                        attrs="{'readonly': ['|', '|', '|', ('supplier', '=', False), ('related_sourcing_ok', '=', False), ('state', '!=', 'draft'), ('po_cft', 'not in', ['po', 'dpo'])]}" />
                     <field name="location_id" 
                         widget="selection"
                         on_change="onChangeLocation(location_id, product_id, rts, order_id)"
@@ -113,7 +116,7 @@
 						domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', order_id)]"
                         context="{'product_id': product_id, 'choose_supplier': True, 'uom': product_uom, 'product_qty': product_uom_qty}"
 						attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), '|', ('type', '=', 'make_to_stock'), ('state', '!=', 'draft')]}"
-						on_change="onChangeSupplier(supplier)" />
+						on_change="onChangeSupplier(supplier, type)" />
 					<field name="customer" invisible="1" />
 					<field name="estimated_delivery_date" />
 					<button name="confirmLine" string="Source Line" icon="gtk-go-forward" type="object" attrs="{'invisible':[('display_confirm_button', '=', False)]}" />
@@ -221,6 +224,29 @@
             action="action_po_automation_config"
             parent="base.menu_sale_config_sales"
             name="PO Automation" />
+        
+        <!-- Related sourcing group -->
+        <record id="related_sourcing_search_view" model="ir.ui.view">
+            <field name="name">related.sourcing.search.view</field>
+            <field name="model">related.sourcing</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <search string="Related sourcing group">
+                    <field name="name" />
+                </search>
+            </field>
+        </record>
+
+        <record id="related_sourcing_form_view" model="ir.ui.view">
+            <field name="name">related.sourcing.form.view</field>
+            <field name="model">related.sourcing</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Related sourcing group">
+                    <field name="name" />
+                </form>
+            </field>
+        </record>
 
 	</data>
 </openerp>

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing.py'
--- bin/addons/sourcing/wizard/multiple_sourcing.py	2016-03-17 10:38:35 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing.py	2016-05-18 10:13:49 +0000
@@ -54,6 +54,10 @@
             _SELECTION_PO_CFT,
             string='PO/CFT',
         ),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Group',
+        ),
         'location_id': fields.many2one(
             'stock.location',
             string='Location',
@@ -71,6 +75,9 @@
             string='Error',
             help="If there is line without need sourcing on selected lines",
         ),
+        'related_sourcing_ok': fields.boolean(
+            string='Related sourcing OK',
+        ),
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -101,13 +108,17 @@
             'run_scheduler': po_auto_cfg_obj.get_po_automation(cr, uid, context=context),
             'type': 'make_to_stock',
             'po_cft': False,
+            'related_sourcing_ok': 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 already sourced lines, a message
         # will be displayed at the top of the wizard
-        loc = -1  # first location flag
-        supplier = -1  # first location flag
+        res['type'] = 'make_to_stock'
+        res['po_cft'] = False
+        loc = -1 # first location flag
+        supplier = -1 # first location flag
+        group = None
         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)
@@ -127,10 +138,20 @@
                         supplier = temp
                     elif supplier != temp:
                         supplier = False
+
+                if not line.related_sourcing_ok or not line.related_sourcing_id:
+                    group = False
+                else:
+                    temp = line.related_sourcing_id.id
+                    if group is None:
+                        group = temp
+                    elif group != temp:
+                        group = 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
+                group = False
                 temploc = line.location_id.id
                 if loc == -1:  # first location
                     loc = temploc
@@ -142,6 +163,10 @@
             res['location_id'] = loc
         if supplier != -1:
             res['supplier_id'] = supplier
+        if group is not None:
+            res['related_sourcing_id'] = group
+
+        res['related_sourcing_ok'] = sol_obj._check_related_sourcing_ok(cr, uid, supplier, res['type'], context=context)
 
         if not res['line_ids']:
             raise osv.except_osv(
@@ -153,6 +178,18 @@
 
         return res
 
+    def _get_related_sourcing_id(self, wiz):
+        """
+        Return the ID of a related.sourcing record or False
+        :param wiz: browse_record of multiple.sourcing.wizard
+        :return: ID of a related.sourcing record or False
+        """
+        if wiz.related_sourcing_id and wiz.supplier_id and wiz.supplier_id.partner_type == 'esc' \
+           and wiz.supplier_id.split_po == 'yes':
+            return wiz.related_sourcing_id.id
+
+        return False
+
     def save_lines(self, cr, uid, ids, context=None):
         """
         Set values defined on the wizard to the lines of the wizard.
@@ -195,6 +232,7 @@
                             'type': wiz.type,
                             'po_cft': wiz.po_cft,
                             'supplier': wiz.supplier_id and wiz.supplier_id.id or False,
+                            'related_sourcing_id': self._get_related_sourcing_id(wiz),
                             'location_id': wiz.location_id.id and wiz.location_id.id or False,
                         }, context=context)
                     except osv.except_osv, e:
@@ -272,13 +310,14 @@
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def change_type(self, cr, uid, ids, l_type, context=None):
+    def change_type(self, cr, uid, ids, l_type, supplier, 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 supplier: Value of the field 'supplier'
         :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.
         """
@@ -289,9 +328,21 @@
             context = {}
 
         if l_type == 'make_to_order':
-            return {'value': {'location_id': False}}
+            return {
+                'value': {
+                    'location_id': False,
+                    'related_sourcing_ok': sol_obj._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context)
+                },
+            }
 
-        res = {'value': {'po_cft': False, 'supplier_id': False}}
+        res = {
+            'value': {
+                'po_cft': False,
+                'supplier_id': False,
+                'related_sourcing_ok': False,
+                'related_sourcing_id': False,
+            },
+        }
         if not context or not context[0] or not context[0][2]:
             return res
 
@@ -313,9 +364,24 @@
                 all_line_empty = False
 
         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,
+                    'location_id': stock_loc,
+                    'related_sourcing_ok': False,
+                    'related_sourcing_id': False,
+                },
+            }
 
-        return {'value': {'po_cft': False, 'supplier_id': False}}
+        return {
+            'value': {
+                'po_cft': False,
+                'supplier_id': False,
+                'related_sourcing_ok': False,
+                'related_sourcing_id': False,
+            },
+        }
 
     def change_po_cft(self, cr, uid, ids, po_cft, context=None):
         """
@@ -332,23 +398,27 @@
 
         return {}
 
-    def change_supplier(self, cr, uid, ids, supplier, context=None):
+    def change_supplier(self, cr, uid, ids, supplier, l_type, 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 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.
         """
         partner_obj = self.pool.get('res.partner')
+        sol_obj = self.pool.get('sale.order.line')
 
         if context is None:
             context = {}
 
         result = {}
+        related_sourcing_ok = False
         if supplier:
+            related_sourcing_ok = sol_obj._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context)
             partner = partner_obj.browse(cr, uid, supplier, context)
             # Check if the partner has addresses
             if not partner.address:
@@ -356,6 +426,14 @@
                     'title': _('Warning'),
                     'message': _('The chosen partner has no address. Please define an address before continuing.'),
                 }
+
+        result['value'] = {
+            'related_sourcing_ok': related_sourcing_ok,
+        }
+
+        if not related_sourcing_ok:
+            result['value']['related_sourcing_id'] = False
+
         return result
 
     def change_location(self, cr, uid, ids, location_id, line_ids, context=None):

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing_view.xml'
--- bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2016-03-01 14:43:23 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2016-05-18 10:13:49 +0000
@@ -18,7 +18,7 @@
                         <field name="line_ids" nolabel="1" colspan="4" />
                         <separator colspan="4" string="Procurement method" />
                         <field name="type" 
-                               on_change="change_type(type)"/>
+                               on_change="change_type(type, supplier)"/>
                         <field name="po_cft" attrs="{'readonly': [('type', '=', 'make_to_stock')]}"
                                on_change="change_po_cft(po_cft)"/>
                         <field name="run_scheduler" />
@@ -26,15 +26,18 @@
                         <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)"
+                               on_change="change_supplier(supplier_id, type)"
                         />
+                    
                         <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)"
-                        />
+                               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="related_sourcing_ok" invisible="1" />
+                        <field name="related_sourcing_id"
+                            attrs="{'readonly': ['|', '|', '|', ('supplier_id', '=', False), ('related_sourcing_ok', '=', False), ('type', '!=', 'make_to_order'), ('po_cft', 'not in', ['po', 'dpo'])]}" />
                     </group>
                     <separator colspan="4" string="Actions" />
                     <button special="cancel" string="Cancel" icon="gtk-cancel" help="Close the wizard" />