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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-10-21 15:36:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-10-25 08:45:55 +0000
@@ -74611,6 +74611,7 @@
 "	Number of columns is not equal to %s"
 msgstr "\n"
 "	Le nombre de colonnes n'est pas égal à %s"
+<<<<<<< TREE
 
 #. module: specific_rules
 #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143
@@ -74683,3 +74684,32 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+=======
+
+#. module: procurement_request
+#: code:addons/procurement_request/procurement_request.py:553
+#, python-format
+msgid "You can not confirm internal request containing temporary product (line: %s)"
+msgstr "Vous ne pouvez pas confirmer une demande interne qui contient des produits Temporaires (ligne : %s)"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:1205
+#, python-format
+msgid "You can not source lines with Temporary products. Details: \n"
+" %s"
+msgstr "Vous ne pouvez pas sourcer des lignes avec des produits temporaires. Détails : \n"
+" %s"
+
+#. module: sale_override
+#: code:addons/sale_override/sale.py:1347
+#, python-format
+msgid "You cannot confirm field order containing temporary product (line: %s)"
+msgstr "Vous ne pouvez pas confirmer une commande terrain qui contient des produits temporaires (ligne : %s)"
+
+#. module: purchase_override
+#: code:addons/purchase_override/purchase.py:1122
+#: code:addons/purchase_override/purchase.py:1365
+#, python-format
+msgid "You cannot confirm purchase order containing temporary product (line: %s)"
+msgstr "Vous ne pouvez pas confirmer un bon de commande qui contient des produits Temporaires (ligne : %s)"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2016-08-18 08:32:03 +0000
+++ bin/addons/procurement_request/procurement_request.py	2016-10-25 08:45:55 +0000
@@ -542,6 +542,16 @@
                     nb_lines += 1
                 if line.product_uom_qty <= 0.00:
                     raise osv.except_osv(_('Error'), _('A line must a have a quantity larger than 0.00'))
+
+                # 5/ Check if there is a temporary product in the sale order :
+                temp_prod_ids = self.pool.get('product.product').search(cr, uid, [('international_status', '=', 5)], context=context)
+                line_with_temp_ids = line_obj.search(cr, uid, [('order_id', '=', req.id), ('product_id', 'in', temp_prod_ids)], context=context)
+                line_err = ' / '.join([str(line.line_number) for l in line_obj.browse(cr, uid, line_with_temp_ids, context=context)])
+                if line_with_temp_ids:
+                    raise osv.except_osv(
+                        _("Warning"),
+                        _("You can not confirm internal request containing temporary product (line: %s)") % line_err,
+                    )
             if nb_lines:
                 raise osv.except_osv(_('Error'), _('Please check the lines : you cannot have "To Be confirmed" for Nomenclature Level". You have %s lines to correct !') % nb_lines)
             self.log(cr, uid, req.id, _("The internal request '%s' has been validated (nb lines: %s).") % (req.name, len(req.order_line)), context=context)

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-10-16 10:55:55 +0000
+++ bin/addons/purchase_override/purchase.py	2016-10-25 08:45:55 +0000
@@ -1087,6 +1087,7 @@
         '''
         # Objects
         po_line_obj = self.pool.get('purchase.order.line')
+        product_obj = self.pool.get('product.product')
 
         if context is None:
             context = {}
@@ -1110,6 +1111,18 @@
                 errors = ' / '.join(str(x) for x in line_error)
                 raise osv.except_osv(_('Error !'), _('You cannot have a purchase order line with a 0.00 Unit Price or 0.00 Subtotal. Lines in exception : %s') % errors)
 
+            # Check if there is a temporary product in the purchase order :
+            temp_prod_ids = product_obj.search(cr, uid, [('international_status', '=', 5)], context=context)
+            line_with_temp_ids = po_line_obj.search(cr, uid, [('order_id', '=', po.id), ('product_id', 'in', temp_prod_ids)], context=context)
+            line_err = " / ".join([str(l.line_number) for l in po_line_obj.browse(cr, uid, line_with_temp_ids, context=context)])
+
+            if line_with_temp_ids:
+                raise osv.except_osv(
+                    _("Warning"),
+                    _("You cannot confirm purchase order containing temporary product (line: %s)") % line_err,
+                )
+
+
             # Check if the pricelist of the order is good according to currency of the partner
             pricelist_ids = self.pool.get('product.pricelist').search(cr, uid,
                     [('in_search', '=', po.partner_id.partner_type)],
@@ -1337,6 +1350,20 @@
         sol_obj = self.pool.get('sale.order.line')
         exp_sol_obj = self.pool.get('expected.sale.order.line')
         so_obj =  self.pool.get('sale.order')
+        product_obj = self.pool.get('product.product')
+        po_line_obj = self.pool.get('purchase.order.line')
+
+        # Check if there is a temporary product in the purchase order :
+        for po in self.browse(cr, uid, ids, context=context):
+            temp_prod_ids = product_obj.search(cr, uid, [('international_status', '=', 5)], context=context)
+            line_with_temp_ids = po_line_obj.search(cr, uid, [('order_id', '=', po.id), ('product_id', 'in', temp_prod_ids)], context=context)
+            line_err = " / ".join([str(l.line_number) for l in po_line_obj.browse(cr, uid, line_with_temp_ids, context=context)])
+
+            if line_with_temp_ids:
+                raise osv.except_osv(
+                    _("Warning"),
+                    _("You cannot confirm purchase order containing temporary product (line: %s)") % line_err,
+                )
 
         # Create extra lines on the linked FO/IR
         self.create_extra_lines_on_fo(cr, uid, ids, context=context)

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-08-22 13:55:25 +0000
+++ bin/addons/sale_override/sale.py	2016-10-25 08:45:55 +0000
@@ -1266,6 +1266,7 @@
             3/ Check of line procurement method in case of loan FO
             4/ Check if the currency of the order is compatible with
                the currency of the partner
+            5/ Check if there is temporary products
 
         :param cr: Cursor to the database
         :param uid: ID of the user that runs the method
@@ -1278,6 +1279,7 @@
         # Objects
         line_obj = self.pool.get('sale.order.line')
         pricelist_obj = self.pool.get('product.pricelist')
+        product_obj = self.pool.get('product.product')
 
         if context is None:
             context = {}
@@ -1335,6 +1337,17 @@
 'Please change the currency to choose a compatible currency.'),
                 )
 
+            # 5/ Check if there is a temporary product in the sale order :
+            temp_prod_ids = product_obj.search(cr, uid, [('international_status', '=', 5)], context=context)
+            line_with_temp_ids = line_obj.search(cr, uid, [('order_id', '=', order.id), ('product_id', 'in', temp_prod_ids)], context=context)
+            line_err = ' / '.join([str(line.line_number) for l in line_obj.browse(cr, uid, line_with_temp_ids, context=context)])
+            if line_with_temp_ids:
+                raise osv.except_osv(
+                    _("Warning"),
+                    _("You cannot confirm field order containing temporary product (line: %s)") % line_err,
+                )
+
+
             if not order.procurement_request and order.split_type_sale_order == 'original_sale_order':
                 line_obj.update_supplier_on_line(cr, uid, line_ids, context=context)
 

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-09-13 13:22:03 +0000
+++ bin/addons/sourcing/sale_order_line.py	2016-10-25 08:45:55 +0000
@@ -1203,6 +1203,8 @@
         # Objects
         order_obj = self.pool.get('sale.order')
         po_auto_obj = self.pool.get('po.automation.config')
+        data_obj = self.pool.get('ir.model.data')
+        product_obj = self.pool.get('product.product')
 
         if context is None:
             context = {}
@@ -1223,6 +1225,18 @@
                 Please select it within the lines of the associated Field Order (through the "Field Orders" menu).
                 """))
 
+        temp_status = data_obj.get_object_reference(cr, uid, 'product_attributes', 'int_5')[1]
+        temp_products = product_obj.search(cr, uid, [('international_status', '=', temp_status)], context=context)
+        if temp_products:
+            # checking for temporary products :
+            line_ids = self.search(cr, uid, [('id', 'in', ids), ('product_id', 'in', temp_products),], context=context)
+            err_msg = []
+            for l in self.browse(cr, uid, line_ids, context=context):
+                err_msg.append(_('Line %s of the order %s') % (l.line_number, l.order_id.name))
+
+            if err_msg:
+                raise osv.except_osv(_('Warning'), _("You can not source lines with Temporary products. Details: \n %s") % '\n'.join(msg for msg in err_msg))
+
         loan_stock = self.search(cr, uid, [
             ('id', 'in', ids),
             ('type', '=', 'make_to_order'),