Merge lp:~dorian-kemps/unifield-server/US-4697 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2019-01-28 09:29:28 +0000
+++ bin/addons/base/rng/view.rng	2019-04-30 15:43:45 +0000
@@ -488,6 +488,7 @@
             <rng:optional><rng:attribute name="filter_selector"/></rng:optional>
             <rng:optional><rng:attribute name="default_selector"/></rng:optional>
             <rng:optional><rng:attribute name="o2m_selectable"/></rng:optional>
+            <rng:optional><rng:attribute name="required_error_msg"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="diagram"/>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-04-08 09:30:07 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-04-30 15:43:45 +0000
@@ -105336,6 +105336,7 @@
 msgstr "\n"
 "                                        Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
 "                                    "
+<<<<<<< TREE
 
 #. module: msf_homere_interface
 #: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:580
@@ -105388,3 +105389,12 @@
 #, python-format
 msgid "Product %s, BN: %s not enough stock to process quantity %s %s (stock level: %s)"
 msgstr "Produit %s, Lot: %s, pas assez de stock pour traiter la qantité %s %s (quantité en stock: %s)"
+=======
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:1606
+#: view:multiple.sourcing.wizard:0
+#, python-format
+msgid "For this Supplier you have to select a Sourcing Group"
+msgstr "Vous devez sélectionner un Groupe de Sourcing pour ce Fournisseur"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2019-02-11 09:16:33 +0000
+++ bin/addons/sourcing/sale_order_line.py	2019-04-30 15:43:45 +0000
@@ -250,6 +250,8 @@
                 'display_confirm_button': line.state == 'validated',
                 'sale_order_in_progress': line.order_id.sourcing_trace_ok,
                 'sale_order_state': self._get_sale_order_state(cr, uid, line.order_id, context=context),
+                'supplier_type': line.supplier and line.supplier.partner_type or False,
+                'supplier_split_po': line.supplier and line.supplier.split_po or False,
             }
             res[line.id] = values
 
@@ -528,6 +530,24 @@
             store=False,
             multi='line_info',
         ),
+        'supplier_type': fields.function(
+            _get_line_values,
+            method=True,
+            string='Supplier Type',
+            type='char',
+            readonly=True,
+            store=False,
+            multi='line_info',
+        ),
+        'supplier_split_po': fields.function(
+            _get_line_values,
+            method=True,
+            string='Supplier can Split POs',
+            type='char',
+            readonly=True,
+            store=False,
+            multi='line_info',
+        ),
         'stock_uom_id': fields.related(
             'product_id',
             'uom_id',
@@ -1581,6 +1601,9 @@
         company_currency_id = self.pool.get('res.users').get_company_currency_id(cr, uid)
 
         for sourcing_line in self.browse(cr, uid, ids, context=context):
+            if sourcing_line.supplier and sourcing_line.supplier_type == 'esc' and \
+                    sourcing_line.supplier_split_po == 'yes' and not sourcing_line.related_sourcing_id:
+                raise osv.except_osv(_('Error'), _('For this Supplier you have to select a Sourcing Group'))
             if sourcing_line.state in ['validated', 'validated_p']:
                 if sourcing_line.type == 'make_to_stock':
                     self.check_location_integrity(cr, uid, [sourcing_line.id], context=context)
@@ -2293,6 +2316,8 @@
             result['value'].update({
                 'related_sourcing_id': False,
                 'related_sourcing_ok': False,
+                'supplier_type': False,
+                'supplier_split_po': 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':
@@ -2318,6 +2343,8 @@
         result['value'].update({
             'estimated_delivery_date': estDeliveryDate.strftime('%Y-%m-%d'),
             'related_sourcing_ok': related_sourcing_ok,
+            'supplier_type': partner and partner.partner_type or False,
+            'supplier_split_po': partner and partner.split_po or False,
         })
         if not related_sourcing_ok:
             result['value']['related_sourcing_id'] = False

=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml	2018-10-15 12:44:12 +0000
+++ bin/addons/sourcing/sourcing_view.xml	2019-04-30 15:43:45 +0000
@@ -52,8 +52,11 @@
 					    on_change="onChangePoCft(po_cft, order_id, supplier)" 
                         attrs="{'readonly': ['|', ('type', '=', 'make_to_stock'), ('state', '!=', 'validated')], 'required': [('type', '=', 'make_to_order')]}" />
 					<field name="related_sourcing_ok" invisible="1" />
+                    <field name="supplier_type" invisible="1" />
+                    <field name="supplier_split_po" invisible="1" />
                     <field name="related_sourcing_id"
-                        attrs="{'readonly': ['|', '|', '|', ('supplier', '=', False), ('related_sourcing_ok', '=', False), ('state', '!=', 'validated'), ('po_cft', 'not in', ['po', 'dpo'])]}" />
+                        attrs="{'readonly': ['|', '|', '|', ('supplier', '=', False), ('related_sourcing_ok', '=', False), ('state', '!=', 'validated'), ('po_cft', 'not in', ['po', 'dpo'])],
+						'required': [('supplier', '!=', False), ('supplier_type', '=', 'esc'), ('supplier_split_po', '=', 'yes')]}" />
                     <field name="location_id" 
                         widget="selection"
                         on_change="onChangeLocation(location_id, product_id, rts, order_id)"

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing.py'
--- bin/addons/sourcing/wizard/multiple_sourcing.py	2018-10-15 12:44:12 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing.py	2019-04-30 15:43:45 +0000
@@ -33,6 +33,27 @@
 class multiple_sourcing_wizard(osv.osv_memory):
     _name = 'multiple.sourcing.wizard'
 
+    def _get_values(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Get some values from the wizard.
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+
+        for wizard in self.browse(cr, uid, ids, context=context):
+            values = {
+                'supplier_type': wizard.supplier_id and wizard.supplier_id.partner_type or False,
+                'supplier_split_po': wizard.supplier_id and wizard.supplier_id.split_po or False,
+            }
+            res[wizard.id] = values
+
+        return res
+
     _columns = {
         'line_ids': fields.many2many(
             'sale.order.line',
@@ -78,6 +99,24 @@
         'related_sourcing_ok': fields.boolean(
             string='Related sourcing OK',
         ),
+        'supplier_type': fields.function(
+            _get_values,
+            method=True,
+            string='Supplier Type',
+            type='char',
+            readonly=True,
+            store=False,
+            multi='wizard_info',
+        ),
+        'supplier_split_po': fields.function(
+            _get_values,
+            method=True,
+            string='Supplier can Split POs',
+            type='char',
+            readonly=True,
+            store=False,
+            multi='wizard_info',
+        ),
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -430,7 +469,7 @@
         if context is None:
             context = {}
 
-        result = {}
+        result = {'value': {}}
         related_sourcing_ok = False
         if supplier:
             related_sourcing_ok = sol_obj._check_related_sourcing_ok(cr, uid, supplier, l_type, context=context)
@@ -442,9 +481,19 @@
                     'message': _('The chosen partner has no address. Please define an address before continuing.'),
                 }
 
-        result['value'] = {
+            result['value'].update({
+                'supplier_type': partner and partner.partner_type or False,
+                'supplier_split_po': partner and partner.split_po or False,
+            })
+        else:
+            result['value'].update({
+                'supplier_type': False,
+                'supplier_split_po': False,
+            })
+
+        result['value'].update({
             'related_sourcing_ok': related_sourcing_ok,
-        }
+        })
 
         if not related_sourcing_ok:
             result['value']['related_sourcing_id'] = False

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing_view.xml'
--- bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2018-10-15 12:44:12 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing_view.xml	2019-04-30 15:43:45 +0000
@@ -36,8 +36,12 @@
                                attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
                                on_change="change_location(location_id, line_ids)" />
                         <field name="related_sourcing_ok" invisible="1" />
+                        <field name="supplier_type" invisible="1" />
+                        <field name="supplier_split_po" 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'])]}" />
+                            attrs="{'readonly': ['|', '|', '|', ('supplier_id', '=', False), ('related_sourcing_ok', '=', False), ('type', '!=', 'make_to_order'), ('po_cft', 'not in', ['po', 'dpo'])],
+                            'required': [('supplier_id', '!=', False), ('supplier_type', '=', 'esc'), ('supplier_split_po', '=', 'yes')]}"
+                            required_error_msg="For this Supplier you have to select a Sourcing Group" />
                     </group>
                     <separator colspan="4" string="Actions" />
                     <button special="cancel" string="Cancel" icon="gtk-cancel" help="Close the wizard" />

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2019-02-08 16:56:18 +0000
+++ bin/osv/orm.py	2019-04-30 15:43:45 +0000
@@ -1557,6 +1557,10 @@
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('help'))
                 if trans:
                     node.set('help', trans)
+            if node.get('required_error_msg'):
+                trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('required_error_msg'))
+                if trans:
+                    node.set('required_error_msg', trans)
             if node.get('string'):
                 trans = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], node.get('string'))
                 if trans == node.get('string') and ('base_model_name' in context):

=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py	2018-10-02 14:58:18 +0000
+++ bin/tools/translate.py	2019-04-30 15:43:45 +0000
@@ -562,6 +562,8 @@
         res.append(de.get('confirm').encode("utf8"))
     if de.get("help"):
         res.append(de.get('help').encode("utf8"))
+    if de.get("required_error_msg"):
+        res.append(de.get('required_error_msg').encode("utf8"))
     if de.get("filter_selector"):
         try:
             eval_filter = safe_eval(de.get('filter_selector'))