Merge lp:~jfb-tempo-consulting/unifield-server/US-4133 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/purchase_override/report/merged_order.py'
--- bin/addons/purchase_override/report/merged_order.py	2014-03-07 10:00:41 +0000
+++ bin/addons/purchase_override/report/merged_order.py	2018-04-16 08:13:53 +0000
@@ -30,6 +30,7 @@
             'to_time': self.str_to_time,
             'enumerate': enumerate,
             'getOrigin': self._get_origin,
+            'get_merged_lines': self.get_merged_lines,
         })
 
     def _get_origin(self, origin, number=5):
@@ -57,6 +58,41 @@
 
         return res
 
+    def get_merged_lines(self, order):
+        all_prod = {}
+        line_obj = self.pool.get('purchase.order.line')
+        line_ids = line_obj.search(self.cr, self.uid, [('order_id', '=', order.id), ('state', 'not in', ['cancel', 'cancel_r'])])
+
+        for line in line_obj.browse(self.cr, self.uid, line_ids, context=self.localcontext):
+            if not line.product_id:
+                p_key = line.nomenclature_description
+                p_name = line.nomenclature_description
+                default_code = ''
+            else:
+                p_key = line.product_id.id
+                p_name = line.product_id.name
+                default_code = line.product_id.default_code
+
+            key = (p_key, line.product_uom.id)
+            if key not in all_prod:
+                all_prod[key] = {
+                    'default_code': default_code,
+                    'supplier_code': line.supplier_code,
+                    'name': p_name,
+                    'price_unit': line.price_unit,
+                    'price_subtotal': line.price_subtotal,
+                    'product_uom': line.product_uom.name,
+                    'quantity': line.product_qty,
+                    'comment': line.comment or '',
+                }
+            else:
+                all_prod[key]['price_unit'] = ((all_prod[key]['price_unit'] * all_prod[key]['quantity']) + (line.product_qty*line.price_unit)) / (line.product_qty+all_prod[key]['quantity'])
+                all_prod[key]['quantity'] += line.product_qty
+                all_prod[key]['price_subtotal'] += line.price_subtotal
+                if line.comment:
+                    all_prod[key]['comment'] += ' %s' % line.comment
+
+        return sorted(all_prod.values(), key=lambda x: x['default_code'] or x['name'])
 
     def str_to_time(self, time):
         if isinstance(time, str):

=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
--- bin/addons/purchase_override/report/merged_order.rml	2017-09-22 15:31:55 +0000
+++ bin/addons/purchase_override/report/merged_order.rml	2018-04-16 08:13:53 +0000
@@ -593,32 +593,31 @@
 
         <section>
             <blockTable colWidths="65.0,95.0,295.5,95.0,55.5,60.0,51.0,55.0" style="LinesTable">
-                [[repeatIn(objects[0].merged_line_ids,'line')]]
+                [[repeatIn(get_merged_lines(objects[0]),'line')]]
                 <tr>
                     <td>
-                    	<para style="LinesBlue">[[ line.supplier_code ]]</para>
-                    </td>
-                    <td>
-                        <para style="LinesBlue">[[ line.product_id.default_code ]]</para>
-                    </td>
-                    <td>
-                        <para style="LinesBlue">[[ line.product_id and line.product_id.name or removeParentNode('para') ]]</para>
-                        <para style="LinesBlue">[[ not line.product_id and line.nomen_manda_0.name or removeParentNode('para') ]] [[ line.nomen_manda_1 and '/ %s' % line.nomen_manda_1.name or '' ]] [[ line.nomen_manda_2 and '/ %s' % line.nomen_manda_2.name or '' ]] [[ line.nomen_manda_3 and '/ %s' % line.nomen_manda_3.name or '' ]] [[ line.nomen_sub_0 and '/ %s' % line.nomen_sub_0.name or '' ]] [[ line.nomen_sub_1 and '/ %s' % line.nomen_sub_1.name or '' ]] [[ line.nomen_sub_2 and '/ %s' % line.nomen_sub_2.name or '' ]] [[ line.nomen_sub_3 and '/ %s' % line.nomen_sub_3.name or '' ]] [[ line.nomen_sub_4 and '/ %s' % line.nomen_sub_4.mane or '' ]] [[ line.nomen_sub_5 and '/ %s' % line.nomen_sub_5.name or '' ]]</para>
-                    </td>
-                    <td>
-                        <para style="LinesBlue">[[ line.comment ]]</para>
-                    </td>
-                    <td>
-                        <para style="LinesBlue" alignment="RIGHT">[[ line.product_qty or '0.00' ]]</para>
-                    </td>
-                    <td>
-                        <para style="LinesBlue" alignment="CENTER">[[ line.product_uom.name ]]</para>
-                    </td>
-                    <td>
-                        <para style="LinesBlue" alignment="RIGHT">[[ line.price_unit or '0.00' ]]</para>
-                    </td>
-                    <td>
-                         <para style="LinesBlue" alignment="RIGHT">[[ line.price_subtotal or '0.00' ]]</para>
+                    	<para style="LinesBlue">[[ line['supplier_code'] ]]</para>
+                    </td>
+                    <td>
+                        <para style="LinesBlue">[[ line['default_code'] ]]</para>
+                    </td>
+                    <td>
+                        <para style="LinesBlue">[[ line['name'] ]]</para>
+                    </td>
+                    <td>
+                        <para style="LinesBlue">[[ line['comment'] ]]</para>
+                    </td>
+                    <td>
+                        <para style="LinesBlue" alignment="RIGHT">[[ line['quantity'] or '0.00' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LinesBlue" alignment="CENTER">[[ line['product_uom'] ]]</para>
+                    </td>
+                    <td>
+                        <para style="LinesBlue" alignment="RIGHT">[[ round(line['price_unit'], 4) or '0.00' ]]</para>
+                    </td>
+                    <td>
+                         <para style="LinesBlue" alignment="RIGHT">[[ line['price_subtotal'] or '0.00' ]]</para>
                     </td>
                 </tr>
             </blockTable>