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

[jftempo]

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2016-04-25 09:24:04 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2016-05-19 07:05:28 +0000
@@ -1596,7 +1596,7 @@
         # for Internal Request (IR) on make_to_order we update PO line data according to the data of the IR (=sale_order)
         sale_order_line_ids = sale_obj.search(cr, uid, [('procurement_id', '=', procurement.id)], context=context)
         for sol in sale_obj.browse(cr, uid, sale_order_line_ids, context=context):
-            if sol.order_id.procurement_request and not sol.product_id and sol.comment:
+            if (sol.order_id.procurement_request or procurement.supplier.partner_type == 'esc') and not sol.product_id and sol.comment:
                 line.update({'product_id': False,
                              'name': 'Description: %s' % sol.comment,
                              'comment': sol.comment,

=== modified file 'bin/addons/procurement/procurement.py'
--- bin/addons/procurement/procurement.py	2015-02-05 16:24:18 +0000
+++ bin/addons/procurement/procurement.py	2016-05-19 07:05:28 +0000
@@ -172,7 +172,14 @@
         """
         if not context:
             context = {}
-        return all(not procurement.move_id or procurement.move_id.state == 'done' for procurement in self.browse(cr, uid, ids, context=context))
+
+        def check_move(proc):
+            c1 = not proc.move_id or proc.move_id.state == 'done'
+            c2 = proc.po_cft == 'dpo' and proc.move_id.state == 'hidden'
+            return c1 or c2
+
+        return all(check_move(procurement) for procurement in self.browse(cr, uid, ids, context=context))
+
     #
     # This method may be overrided by objects that override procurement.order
     # for computing their own purpose

=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2016-04-25 09:24:04 +0000
+++ bin/addons/procurement_request/procurement_request.py	2016-05-19 07:05:28 +0000
@@ -568,9 +568,9 @@
                         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']:
+                    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' or 'Intermission' type.
+                        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')

=== 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-19 07:05:28 +0000
@@ -1374,9 +1374,12 @@
         ad_obj = self.pool.get('analytic.distribution')
         date_tools = self.pool.get('date.tools')
         fields_tools = self.pool.get('fields.tools')
+        data_obj = self.pool.get('ir.model.data')
         db_date_format = date_tools.get_db_date_format(cr, uid, context=context)
         wf_service = netsvc.LocalService("workflow")
 
+        tbd_product_id = data_obj.get_object_reference(cr, uid, 'msf_doc_import', 'product_tbd')[1]
+
         # update corresponding fo if exist
         if so_ids is None:
             so_ids = self.get_so_ids_from_po_ids(cr, uid, ids, context=context)
@@ -1484,12 +1487,28 @@
                     # write the line
                     sol_obj.write(cr, uid, sol_ids, fields_dic, context=ctx)
 
-                    if so.procurement_request and so.location_requestor_id.usage == 'customer' \
-                                              and line.procurement_id.move_id \
-                                              and not line.procurement_id.move_id.processed_stock_move:
-                        # In case of replacement of a non-stockable product by a stockable product
-                        if line.product_id.id != line.procurement_id.product_id.id and  line.procurement_id.product_id.type in ('service', 'service_recep', 'consu') and line.product_id.type == 'product':
-                            # Get OUT linked to IR
+                    cond2 = not sol.product_id or sol.product_id.id != line.procurement_id.product_id.id
+                    cond1 = so.procurement_request and so.location_requestor_id.usage == 'customer'
+                    cond3 = bool(line.procurement_id.move_id and not line.procurement_id.move_id.processed_stock_move)
+
+                    if cond2 and line.product_id:
+                        proc_obj.write(cr, uid, [line.procurement_id.id], {'product_id': line.product_id.id})
+
+                    if (cond1 or (not so.procurement_request and cond2)) and cond3:
+
+                        # In case of FO with not only no product lines, the picking tickes will be created with normal flow
+                        if not so.procurement_request and cond2:
+                            if sol_obj.search(cr, uid, [('order_id', '=', so.id), ('product_id', '!=', False),
+                                                        ('id', '!=', sol.id)], limit=1, context=context):
+                                continue
+
+                        cond4 = line.product_id.id != line.procurement_id.product_id.id
+                        cond5 = line.procurement_id.product_id.type in ('service', 'service_recep', 'consu')
+                        cond6 = line.procurement_id.product_id.id == tbd_product_id
+                        cond7 = line.product_id.type == 'product'
+                        # In case of replacement of a non-stockable product by a stockable product or replacement of To be Defined product
+                        if cond4 and (cond5 or cond6) and cond7:
+                            # Get OUT linked to IR or PICK linked to FO
                             pick_to_confirm = None
                             out_ids = []
                             if line.procurement_id.sale_id:
@@ -1497,16 +1516,18 @@
                                     ('sale_id', '=', line.procurement_id.sale_id.id),
                                     ('type', '=', 'out'),
                                     ('state', 'in', ['draft', 'confirmed', 'assigned']),
-                                ], context=context)
+                                ], limit=1, context=context)
                             if not out_ids:
                                 picking_data = so_obj._get_picking_data(cr, uid, so)
                                 out_ids = [pick_obj.create(cr, uid, picking_data, context=context)]
-                                pick_to_confirm = out_ids
+                                if so.procurement_request:
+                                    pick_to_confirm = out_ids
 
+                            sol = sol_obj.browse(cr, uid, sol.id, context=context)
                             move_data = so_obj._get_move_data(cr, uid, so, sol, out_ids[0], context=context)
                             new_move_id = move_obj.create(cr, uid, move_data, context=context)
                             out_move_id = line.procurement_id.move_id.id
-                            proc_obj.write(cr, uid, [line.procurement_id.id], {'move_id': new_move_id}, context=context)
+                            proc_obj.write(cr, uid, [line.procurement_id.id], {'move_id': new_move_id, 'product_id': sol.product_id.id}, context=context)
                             move_obj.write(cr, uid, [out_move_id], {'state': 'draft'}, context=context)
                             move_obj.unlink(cr, uid, [out_move_id], context=context)
 
@@ -1730,7 +1751,7 @@
             if sol_obj.search(cr, uid,
                     [('order_id', 'in', all_so_ids),
                      ('type', '=', 'make_to_order'),
-                     ('product_id', '!=', False),
+                     #('product_id', '!=', False),
                      ('procurement_id.state', '!=', 'cancel'),
                      ('order_id.procurement_request', '=', False),
                      ('state', 'not in', ['confirmed', 'done'])],

=== modified file 'bin/addons/sale/sale.py'
--- bin/addons/sale/sale.py	2015-12-03 15:32:43 +0000
+++ bin/addons/sale/sale.py	2016-05-19 07:05:28 +0000
@@ -611,7 +611,7 @@
                 self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
-            self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
+            self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line if x.product_id])
             message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
             message = self._hook_message_action_wait(cr, uid, order=o, message=message)
             self.log(cr, uid, o.id, message)

=== 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-19 07:05:28 +0000
@@ -1381,7 +1381,7 @@
                 }, context=context)
                 # check that each line must have a supplier specified
                 if  line.type == 'make_to_order':
-                    if not line.product_id:
+                    if not line.product_id and line.supplier.partner_type != 'esc':
                         raise osv.except_osv(_('Warning'), _("""You can't confirm a Sale Order that contains
                         lines with procurement method 'On Order' and without product. Please check the line %s
                         """) % line.line_number)
@@ -2277,7 +2277,7 @@
 
         return True
 
-    def _get_procurement_order_data(self, line, order, rts_date, context=None):
+    def _get_procurement_order_data(self, line, order, rts_date, product_id=False, context=None):
         """
         Get data for the  procurement order creation according to
         sale.order.line and sale.order values.
@@ -2340,8 +2340,11 @@
                 'tender_id': line.created_by_tender and line.created_by_tender.id or False,
             })
 
-        if line.product_id:
-            proc_data['product_id'] = line.product_id.id
+        if not product_id and line.product_id:
+            product_id = line.product_id.id
+
+        if product_id:
+            proc_data['product_id'] = product_id
 
         return proc_data
 
@@ -2371,6 +2374,7 @@
         proc_obj = self.pool.get('procurement.order')
         pol_obj = self.pool.get('purchase.order.line')
         tl_obj = self.pool.get('tender.line')
+        data_obj = self.pool.get('ir.model.data')
 
         if context is None:
             context = {}
@@ -2451,9 +2455,17 @@
                 # when the line is sourced, we already get a procurement for the line
                 # when the line is confirmed, the corresponding procurement order has already been processed
                 # if the line is draft, either it is the first call, or we call the method again after having added a line in the procurement's po
-                if line.state not in ['sourced', 'confirmed', 'done'] and not (line.created_by_po_line and line.procurement_id) and line.product_id:
+                if line.state not in ['sourced', 'confirmed', 'done'] and not (line.created_by_po_line and line.procurement_id):
+                    if not line.product_id and order.procurement_request:
+                        continue
+
+                    product_id = line.product_id.id
+                    if not order.procurement_request and not line.product_id and line.comment:
+                        product_id = \
+                            data_obj.get_object_reference(cr, uid, 'msf_doc_import', 'product_tbd')[1]
+
                     rts = self._get_date_planned(order, line, prep_lt, db_date_format)
-                    proc_data = self._get_procurement_order_data(line, order, rts, context=context)
+                    proc_data = self._get_procurement_order_data(line, order, rts, product_id=product_id, context=context)
                     proc_id = proc_obj.create(cr, uid, proc_data, context=context)
                     # set the flag for log message
                     if line.so_back_update_dest_po_id_sale_order_line or line.created_by_po:
@@ -2540,7 +2552,7 @@
         # Update the context to get IR lines
         context['procurement_request'] = True
 
-        for order in self.read(cr, uid, ids, ['from_yml_test', 'order_line'], context=context):
+        for order in self.read(cr, uid, ids, ['from_yml_test', 'order_line', 'procurement_request'], context=context):
             if not self._get_ready_to_cancel(cr, uid, [order['id']], order['order_line'], context=context)[order['id']]:
                 return False
 
@@ -2548,15 +2560,21 @@
             if order['from_yml_test']:
                 continue
 
-            line_error = line_obj.search(cr, uid, [
+            domain = [
                 ('order_id', '=', order['id']),
-                ('product_id', '!=', False),
-                ('type', '=', 'make_to_order',),
+                ('type', '=', 'make_to_order'),
                 ('state', '!=', 'confirmed'),
+            ]
+            if order['procurement_request']:
+                domain.append(('product_id', '!=', False))
+
+            domain.extend([
                 '|',
                 ('procurement_id', '=', 'False'),
                 ('procurement_id.state', '!=', 'cancel'),
-            ], limit=1, order='NO_ORDER', context=context)
+            ])
+
+            line_error = line_obj.search(cr, uid, domain, limit=1, order='NO_ORDER', context=context)
 
             if line_error:
                 return False

=== 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-19 07:05:28 +0000
@@ -91,7 +91,7 @@
                     if not so.procurement_request:
                         newargs.append(('partner_type', 'in', ['external', 'esc']))
                     elif so.procurement_request and not sl.product_id:
-                        newargs.append(('partner_type', 'in', ['internal', 'section', 'intermission']))
+                        newargs.append(('partner_type', 'in', ['internal', 'section', 'intermission', 'esc']))
             else:
                 newargs.append(args)
         return newargs
@@ -129,7 +129,7 @@
                     if active_ids:
                         sol = self.pool.get('sale.order.line').browse(cr, uid, active_ids)[0]
                         if not context.get('product_id', False) and sol.order_id.procurement_request:
-                            newargs.append(('partner_type', 'in', ['internal', 'section', 'intermission']))
+                            newargs.append(('partner_type', 'in', ['internal', 'section', 'intermission', 'esc']))
             else:
                 newargs.append(args)
         return newargs

=== 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-19 07:05:28 +0000
@@ -44,6 +44,30 @@
 ]
 
 
+def check_is_service_nomen(obj, cr, uid, nomen=False):
+    """
+    Return True if the nomenclature seleced on the line is a service nomenclature
+    @param cr: Cursor to the database
+    @param uid: ID of the res.users that calls this method
+    @param nomen: ID of the nomenclature to check
+    @return: True or False
+    """
+    nomen_obj = obj.pool.get('product.nomenclature')
+
+    if not nomen:
+        return False
+
+    nomen_srv = nomen_obj.search(cr, uid, [
+        ('name', '=', 'SRV'),
+        ('type', '=', 'mandatory'),
+        ('level', '=', 0),
+    ], limit=1)
+    if not nomen_srv:
+        return False
+
+    return nomen_srv[0] == nomen
+
+
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _description = 'Sales Order Line'
@@ -586,7 +610,8 @@
             ids = [ids]
 
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.product_id.type == 'service_recep' and obj.type != 'make_to_order':
+            if (obj.product_id.type == 'service_recep' or (not obj.product_id and check_is_service_nomen(cr, uid, obj.nomen_manda_0.id))) \
+               and obj.type != 'make_to_order':
                 raise osv.except_osv(
                     _('Error'),
                     _('You must select on order procurement method for Service with Reception products.'),
@@ -679,6 +704,16 @@
                 vals['po_cft'] = 'po'
             elif not ir and vals.get('po_cft', 'po') == 'po':
                 vals['po_cft'] = 'dpo'
+        elif not product and check_is_service_nomen(self, cr, uid, vals.get('nomen_manda_0', False)):
+            vals['po_cft'] = 'dpo'
+
+        if not product:
+            vals.update({
+                'type': 'make_to_order',
+                'po_cft': 'po',
+            })
+            if vals.get('nomen_manda_0') and check_is_service_nomen(self, cr, uid, vals.get('nomen_manda_0')):
+                vals['po_cft'] = 'dpo'
 
         # If type is missing, set to make_to_stock and po_cft to False
         if not vals.get('type', False):
@@ -792,6 +827,7 @@
 
         if isinstance(ids, (int, long)):
             ids = [ids]
+
         for line in self.browse(cr, uid, ids, context=context):
             clc = self._check_loan_conditions(cr, uid, line, context=context)
             if clc:
@@ -810,11 +846,11 @@
                not line.product_id and \
                line.order_id.procurement_request and \
                line.supplier and \
-               line.supplier.partner_type not in ['internal', 'section', 'intermission']:
+               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' or 'Intermission type."""),
+the supplier must be either in 'Internal', 'Inter-section', 'Intermission or 'ESC' type."""),
                 )
 
             if line.product_id and \
@@ -834,10 +870,10 @@
                     _("""You can't source with 'Request for Quotation' to an internal/inter-section/intermission partner."""),
                 )
 
-            if line.product_id and \
-               line.product_id.type in ('service', 'service_recep') and \
-               not line.order_id.procurement_request and \
-               line.po_cft == 'po':
+            cond1 = not line.order_id.procurement_request and line.po_cft == 'po'
+            cond2 = line.product_id and line.product_id.type in ('service', 'service_recep')
+            cond3 = not line.product_id and check_is_service_nomen(self, cr, uid, line.nomen_manda_0.id)
+            if cond1 and (cond2 or cond3):
                 raise osv.except_osv(
                     _('Warning'),
                     _("""'Purchase Order' is not allowed to source a 'Service' product."""),
@@ -859,11 +895,10 @@
                         _('Warning'),
                         _("You can't Source 'from stock' if you don't have product."),
                     )
-                if line.supplier and line.supplier.partner_type in ('external', 'esc'):
+                if line.supplier and line.supplier.partner_type in ('external'):
                     raise osv.except_osv(
                         _('Warning'),
-                        _("You can't Source to an '%s' partner if you don't have product.") %
-                        (line.supplier.partner_type == 'external' and 'External' or 'ESC'),
+                        _("You can't Source to an 'External' partner if you don't have product."),
                     )
 
             if line.state not in ('draft', 'cancel') and line.product_id and line.supplier:
@@ -959,10 +994,19 @@
 
         product = False
 
+        srv_product = False
         if vals.get('product_id', False):
             product = product_obj.browse(cr, uid, vals['product_id'])
             if product.type in ('consu', 'service', 'service_recep'):
-                vals['type'] = 'make_to_order'
+                srv_product = True
+        elif vals.get('nomen_manda_0') and check_is_service_nomen(self, cr, uid, vals.get('nomen_manda_0')):
+            srv_product = True
+
+        if srv_product:
+            vals.update({
+                'type': 'make_to_order',
+                'po_cft': 'dpo',
+            })
 
         if 'state' in vals and vals['state'] == 'cancel':
             self.write(cr, uid, ids, {'cf_estimated_delivery_date': False}, context=context)
@@ -1044,7 +1088,8 @@
         no_prod = self.search(cr, uid, [
             ('id', 'in', ids),
             ('product_id', '=', False),
-            ('order_id.procurement_request', '=', False)
+            ('order_id.procurement_request', '=', False),
+            ('supplier.partner_type', '!=', 'esc'),
         ], count=True, context=context)
 
         if no_prod:
@@ -1079,12 +1124,12 @@
             ('supplier', '!=', False),
             ('product_id', '=', False),
             ('order_id.procurement_request', '=', True),
-            ('supplier.partner_type', 'not in', ['internal', 'section', 'intermission']),
+            ('supplier.partner_type', 'not in', ['internal', 'section', 'intermission', 'esc']),
         ], count=True, context=context)
 
         if mto_no_cft_no_prod:
             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' or 'Intermission' type.
+                    the supplier must be either in 'Internal', 'Inter-Section', 'Intermission' or 'ESC' type.
                     """))
 
         stock_no_loc = self.search(cr, uid, [
@@ -1437,7 +1482,10 @@
 
             if l_type == 'make_to_order':
                 po_cft = 'po'
-                if line and line.product_id and line.product_id.type in ('service', 'service_recep') and line.order_id and not line.order_id.procurement_request:
+                if line and \
+                    ((line.product_id and line.product_id.type in ('service', 'service_recep')) or \
+                     (not line.product_id and check_is_service_nomen(self, cr, uid, line.nomen_manda_0.id))) and \
+                     line.order_id and not line.order_id.procurement_request:
                     po_cft = 'dpo'
 
             result['value'].update({
@@ -1489,7 +1537,11 @@
 
         line = self.browse(cr, uid, line_id, context=context)
 
-        if line.product_id.type in ('service', 'service_recep') and not line.order_id.procurement_request and po_cft == 'po':
+        cond1 = line.product_id.type in ('service', 'service_recep')
+        cond2 = not line.product_id and check_is_service_nomen(self, cr, uid, line.nomen_manda_0.id)
+        cond3 = not line.order_id.procurement_request and po_cft == 'po'
+
+        if (cond1 or cond2) and cond3:
             res['warning'] = {
                 'title': _('Warning'),
                 'message': _("""'Purchase Order' is not allowed to source a 'Service' product."""),