Merge lp:~unifield-team/unifield-server/uf2-1-1rc1-fixes-qt into lp:unifield-server

[Quentin THEURET @Amaris]

Fix for issues raised during UF2-1-1 dev tests.

=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2016-03-24 08:35:00 +0000
+++ bin/addons/procurement_request/procurement_request.py	2016-03-31 13:27:28 +0000
@@ -162,6 +162,8 @@
         """
         Check if a same record already exist. If not, create a new record.
         """
+        mem_obj = self.pool.get('procurement.request.sourcing.document.mem')
+
         if context is None:
             context = {}
 
@@ -183,6 +185,7 @@
             if vals.get('line_ids'):
                 create_data['sourcing_lines'] = [(6, 0, (vals.get('line_ids'),))]
             self.create(cr, uid, create_data, context=context)
+            mem_obj.create(cr, uid, create_data, context=context)
         elif vals.get('line_ids'):
             for chk in self.browse(cr, uid, chk_ids, context=context):
                 sourcing_lines = [vals.get('line_ids')]
@@ -198,11 +201,21 @@
                 'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
             }, context=context)
 
+        if self._name != 'procurement.request.sourcing.document.mem':
+            mem_obj.chk_create(cr, uid, vals, context=context)
+
         return True
 
 procurement_request_sourcing_document()
 
 
+class procurement_request_sourcing_document_mem(osv.osv_memory):
+    _name = 'procurement.request.sourcing.document.mem'
+    _inherit = 'procurement.request.sourcing.document'
+
+procurement_request_sourcing_document_mem()
+
+
 class procurement_request(osv.osv):
     _name = 'sale.order'
     _inherit = 'sale.order'

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2016-03-29 06:09:11 +0000
+++ bin/addons/product_attributes/product_attributes.py	2016-03-31 13:27:28 +0000
@@ -1114,6 +1114,39 @@
 #        (_check_uom_category, _('There are some stock moves with this product on the system. So you should keep the same UoM category than these stock moves.'), ['uom_id', 'uom_po_id']),
 #    ]
 
+    def change_soq_quantity(self, cr, uid, ids, soq, uom_id, context=None):
+        """
+        When the SoQ quantity is changed, check if the new quantity is consistent
+        with rounding value of the product UoM
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of product.product on which the SoQ quantity is changed
+        :param soq: New value for SoQ Quantity
+        :param uom_id: ID of the product.uom linked to the product
+        :param context: Context of the call
+        :return: A dictionary that contains a warning message and the SoQ quantity
+                 rounded with the UoM rounding value
+        """
+        uom_obj = self.pool.get('product.uom')
+
+        if context is None:
+            context = {}
+
+        if not soq or not uom_id:
+            return {}
+
+        res = {}
+        rd_soq = uom_obj._compute_qty(cr, uid, uom_id, soq, uom_id)
+        if rd_soq != soq:
+            res['warning'] = {
+                'title': _('Warning'),
+                'message': _('''SoQ quantity value (%s) is not consistent with UoM rounding value.
+                The SoQ quantity has been automatically rounded to consistent value (%s)''') % (soq, rd_soq),
+            }
+
+        res['value'] = {'soq_quantity': rd_soq}
+        return res
+
     def _on_change_restriction_error(self, cr, uid, ids, *args, **kwargs):
         '''
         Update the message on on_change of product
@@ -1214,6 +1247,14 @@
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
+        data_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         if 'batch_management' in vals:
             vals['track_production'] = vals['batch_management']
             vals['track_incoming'] = vals['batch_management']
@@ -1253,6 +1294,22 @@
                 vals['heat_sensitive_item'] = heat2_id
             vals.update(self.onchange_heat(cr, uid, ids, vals['heat_sensitive_item'], context=context).get('value', {}))
 
+        if context.get('sync_update_execution') and not context.get('bypass_sync_update', False):
+#            stopped_status = data_obj.get_object_reference(cr, uid, 'product_attributes', 'status_3')[1]
+#            phase_out_status = data_obj.get_object_reference(cr, uid, 'product_attributes', 'status_2')[1]
+            if vals.get('active', None) is False:
+                if self.deactivate_product(cr, uid, ids, context=context) is not True:
+                    vals.update({
+                        'active': True,
+#                        'state': stopped_status,
+                    })
+#            elif vals.get('active', None) is True and vals.get('state') == stopped_status:
+            elif vals.get('active', None) is True:
+                vals.update({
+                    'active': True,
+#                    'state': phase_out_status,
+                })
+
         if 'narcotic' in vals or 'controlled_substance' in vals:
             if vals.get('narcotic') == True or tools.ustr(vals.get('controlled_substance', '')) == 'True':
                 vals['controlled_substance'] = 'True'
@@ -1295,6 +1352,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        data_obj = self.pool.get('ir.model.data')
         location_obj = self.pool.get('stock.location')
         po_line_obj = self.pool.get('purchase.order.line')
         tender_line_obj = self.pool.get('tender.line')
@@ -1528,6 +1586,13 @@
                                                         'doc_ref': invoice.invoice_id.number,
                                                         'doc_id': invoice.invoice_id.id}, context=context)
 
+                if context.get('sync_update_execution', False):
+                    context['bypass_sync_update'] = True
+                self.write(cr, uid, product.id, {
+                    'active': True,
+#                    'state': data_obj.get_object_reference(cr, uid, 'product_attributes', 'status_3')[1],
+                }, context=context)
+
                 return {'type': 'ir.actions.act_window',
                         'res_model': 'product.deactivation.error',
                         'view_type': 'form',
@@ -1573,6 +1638,8 @@
                 orderpoint_line_obj.unlink(cr, uid, [orderpoint_line.id],
                     context=context)
 
+        if context.get('sync_update_execution', False):
+            context['bypass_sync_update'] = True
         self.write(cr, uid, ids, {'active': False}, context=context)
 
         return True

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2016-03-24 16:43:45 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2016-03-31 13:27:28 +0000
@@ -122,7 +122,7 @@
                                 <field name="perishable"/>
                                 <field name="batch_management" on_change="onchange_batch_management(batch_management)" />
                                 <separator string="UOM" colspan="2"/>
-                                <field name="soq_quantity" />
+                                <field name="soq_quantity" on_change="change_soq_quantity(soq_quantity, uom_id)" />
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" domain="[('compatible_product_id', '=', active_id)]" />
                                 <field name="uom_po_id" string="Exchangeable Unit of Measure" domain="[('compatible_product_id', '=', active_id)]" />
                             </group>

=== modified file 'bin/addons/sale/sale_view.xml'
--- bin/addons/sale/sale_view.xml	2014-03-12 10:01:11 +0000
+++ bin/addons/sale/sale_view.xml	2016-03-31 13:27:28 +0000
@@ -128,7 +128,7 @@
                                             <field colspan="4"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
                                                 name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False)"
+                                                on_change="product_id_on_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
                                                 />
                                             <field
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-03-24 08:35:00 +0000
+++ bin/addons/sale_override/sale.py	2016-03-31 13:27:28 +0000
@@ -193,6 +193,7 @@
         order_obj = self.pool.get('sale.order')
         sol_obj = self.pool.get('sale.order.line')
         src_doc_obj = self.pool.get('procurement.request.sourcing.document')
+        src_doc_mem = self.pool.get('procurement.request.sourcing.document.mem')
 
         if context is None:
             context = {}
@@ -223,19 +224,43 @@
             ('order_id', 'in', order_ids),
         ], count=True, order='NO_ORDER', context=context)
 
-        # Get number of sourced lines by type (MTS or MTO) 
-        cr.execute('''
-            SELECT count(*) AS nb_line, sol.type AS type
-            FROM sale_order_line sol
-                LEFT JOIN sale_line_sourcing_doc_rel slsdr
-                ON slsdr.sale_line_id = sol.id
-            WHERE
-                slsdr.document_id IN %s
-            GROUP BY sol.type
-        ''', (tuple(src_doc_ids),))
-        res = cr.dictfetchall()
         mem_fsl_nb = 0
         mem_ool_nb = 0
+
+        mem_sol_ids = []
+        src_doc_mem_ids = src_doc_mem.search(cr, uid, [
+            ('order_id', 'in', order_ids),
+        ], context=context)
+        for mem_doc in src_doc_mem.browse(cr, uid, src_doc_mem_ids, context=context):
+            for l in mem_doc.sourcing_lines:
+                if l.id not in mem_sol_ids:
+                    mem_sol_ids.append(l.id)
+                    if l.type == 'make_to_stock':
+                        mem_fsl_nb += 1
+                    elif l.type == 'make_to_order':
+                        mem_ool_nb += 1
+
+        # Get number of sourced lines by type (MTS or MTO)
+        res = []
+        if src_doc_ids:
+            where_sql = ''
+            where_params = [tuple(src_doc_ids)]
+            if mem_sol_ids:
+                where_sql = ' AND sol.id NOT IN %s'
+                where_params.append(tuple(mem_sol_ids))
+            sql = '''
+                SELECT count(*) AS nb_line, sol.type AS type
+                FROM sale_order_line sol
+                    LEFT JOIN sale_line_sourcing_doc_rel slsdr
+                    ON slsdr.sale_line_id = sol.id
+                WHERE
+                    slsdr.document_id IN %%s
+                    %s
+                GROUP BY sol.type
+            ''' % where_sql
+            cr.execute(sql, where_params)
+            res = cr.dictfetchall()
+
         for r in res:
             if r.get('type') == 'make_to_stock':
                 mem_fsl_nb += r.get('nb_line', 0)

=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue.py'
--- bin/addons/supplier_catalogue/supplier_catalogue.py	2016-03-17 16:40:58 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue.py	2016-03-31 13:27:28 +0000
@@ -1012,6 +1012,26 @@
 
         return res
 
+    def change_soq_quantity(self, cr, uid, ids, soq, uom_id, context=None):
+        """
+        When the SoQ quantity is changed, check if the new quantity is consistent
+        with rounding value of the UoM of the catalogue line.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of product.product on which the SoQ quantity is changed
+        :param soq: New value for SoQ Quantity
+        :param uom_id: ID of the product.uom linked to the product
+        :param context: Context of the call
+        :return: A dictionary that contains a warning message and the SoQ quantity
+        rounded with the UoM rounding value
+        """
+        res = self.pool.get('product.product').change_soq_quantity(cr, uid, [], soq, uom_id, context=context)
+
+        if res.get('value', {}).get('soq_quantity', False):
+            res['value']['rounding'] = res['value'].pop('soq_quantity')
+
+        return res
+
     def onChangeSearchNomenclature(self, cr, uid, line_id, position, line_type, nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, num=True, context=None):
         '''
         Method to fill nomenclature fields in search view

=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue_view.xml'
--- bin/addons/supplier_catalogue/supplier_catalogue_view.xml	2014-09-29 12:45:23 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue_view.xml	2016-03-31 13:27:28 +0000
@@ -167,7 +167,7 @@
                     <field name="line_uom_id" />
                     <field name="min_qty" />
                     <field name="unit_price" />
-                    <field name="rounding" />
+                    <field name="rounding" on_change="change_soq_quantity(rounding, line_uom_id)"  />
                     <field name="min_order_qty" />
                     <field name="comment" />
                 </form>
@@ -188,7 +188,7 @@
                            domain="[('uom_by_product', '=', product_id)]" />
                     <field name="min_qty" on_change="change_uom_qty(line_uom_id, min_qty, min_order_qty)" />
                     <field name="unit_price" />
-                    <field name="rounding" />
+                    <field name="rounding" on_change="change_soq_quantity(rounding, line_uom_id)" />
                     <field name="min_order_qty" on_change="change_uom_qty(line_uom_id, min_qty, min_order_qty)" />
                     <field name="comment" />
                     <field name="to_correct_ok" invisible="1"/>
@@ -210,7 +210,7 @@
                     <field name="line_uom_id" />
                     <field name="min_qty" />
                     <field name="unit_price" />
-                    <field name="rounding" />
+                    <field name="rounding" on_change="change_soq_quantity(rounding, line_uom_id)" />
                     <field name="min_order_qty" />
                     <field name="comment" />
                 </tree>