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

[jftempo]

=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_purchase.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_purchase.yml	2013-01-04 15:58:10 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_purchase.yml	2016-10-21 10:36:08 +0000
@@ -120,7 +120,7 @@
     rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
     if object_ids:
         # Create the rule
-        fields = ['confirmed_delivery_date', 'date_planned', 'default_code', 'name', 'notes', 'price_unit', 'product_qty', 'product_uom']
+        fields = ['confirmed_delivery_date', 'date_planned', 'default_code', 'name', 'notes', 'price_unit', 'product_qty', 'product_uom', 'line_number']
         
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'purchase.order.line'), ('name', 'in', fields)], context=context)
         field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'purchase.order.line'), ('name', '=', 'line_number')], context=context)
@@ -184,4 +184,4 @@
         if rule_id:
             self.write(cr, uid, rule_id, vals, context=context)
         # Subscribe to the rule
-        self.subscribe(cr, uid, rule_id)
 \ No newline at end of file
+        self.subscribe(cr, uid, rule_id)
 
=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-07-28 12:34:28 +0000
+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-10-21 10:36:08 +0000
@@ -4,13 +4,10 @@
     <!-- Templating -->
     <template pageSize="(842.0,595.0)" title="Packing-List" author="Unifield,MSF" allowSplitting="20">
         <pageTemplate id="first">
-            <frame id="first" x1="0.0" y1="0.0" width="842" height="520" />
+            <frame id="first" x1="0.0" y1="0.0" width="842" height="580" />
 
             <pageGraphics>
                 <setFont name="Helvetica-Bold" size="13.0"/>
-                <drawString x="20.0" y="555.0">PRE-PACKING LIST ([[ getSel(objects[0], 'state') ]])</drawString>
-                <fill color="blue"/>
-                <drawString x="20.0" y="541.0">[[ objects[0].name ]]</drawString>
                 <image x="705.0" y="525.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
                 <setFont name="Helvetica" size="8" />
                 <fill color="black" />
@@ -21,13 +18,10 @@
         </pageTemplate>
 
         <pageTemplate id="second">
-            <frame id="second" x1="0.0" y1="0.0" width="842" height="520" />
+            <frame id="second" x1="0.0" y1="0.0" width="842" height="580" />
 
             <pageGraphics>
                 <setFont name="Helvetica-Bold" size="13.0"/>
-                <drawString x="20.0" y="555.0">PICKING TICKET ([[ getSel(objects[0], 'state') ]])</drawString>
-                <fill color="blue"/>
-                <drawString x="20.0" y="541.0">[[ objects[0].name ]]</drawString>
                 <image x="725.0" y="525.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
                 <setFont name="Helvetica" size="8" />
                 <fill color="black" />
@@ -45,6 +39,11 @@
             <blockValign value="TOP" />
         </blockTableStyle>
 
+        <blockTableStyle id="HeaderBigInfos">
+            <blockAlignment value="LEFT" />
+            <blockValign value="TOP" />
+        </blockTableStyle>
+
         <blockTableStyle id="WarningTable">
             <blockAlignment value="CENTRE" />
             <blockValign value="MIDDLE" />
@@ -78,6 +77,8 @@
             <blockSpan start="8,0" stop="8,-1" />
         </blockTableStyle>
 
+        <paraStyle name="HeaderInfosBigTitle" fontName="Helvetica-Bold" fontSize="12.0" />
+        <paraStyle name="HeaderInfosBigTitleBlue" fontName="Helvetica-Bold" fontSize="12.0" textColor="blue" />
         <paraStyle name="HeaderInfosTitle" fontName="Helvetica" fontSize="8.0" />
         <paraStyle name="HeaderInfosValue" fontName="Helvetica" fontSize="8.0" textColor="blue" />
 
@@ -98,10 +99,36 @@
     <story>
         [[ repeatIn(objects, 'pt') ]]
 
+        <blockTable colWidths="300.0,170.0,170.0,165.0" style="HeaderBigInfos">
+            <tr>
+                <td>
+                    <para style="HeaderInfosBigTitle">
+                        PRE-PACKING LIST ([[ getSel(pt, 'state') ]])
+                    </para>
+                    <para style="HeaderInfosBigTitleBlue">
+                        [[ pt.name ]]
+                    </para>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </blockTable>
+
         <!-- Empty line -->
         <para style="HeaderInfosTitle">
             <font color="white"> </font>
         </para>
+        <para style="HeaderInfosTitle">
+            <font color="white"> </font>
+        </para>
+        <para style="HeaderInfosTitle">
+            <font color="white"> </font>
+        </para>
+        <para style="HeaderInfosTitle">
+            <font color="white"> </font>
+        </para>
+
 
         <!-- Picking Ticket header values -->
 
@@ -255,6 +282,27 @@
 
         <pto>
             <pto_header>
+        <blockTable colWidths="300.0,170.0,170.0,165.0" style="HeaderBigInfos">
+            <tr>
+                <td>
+                    <para style="HeaderInfosBigTitle">
+                        PRE-PACKING LIST ([[ getSel(pt, 'state') ]])
+                    </para>
+                    <para style="HeaderInfosBigTitleBlue">
+                        [[ pt.name ]]
+                    </para>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+	    <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </blockTable>
                 <blockTable colWidths="30.0,60.0,220.0,55.0,75.0,65.0,20.0,20.0,20.0,55.0,45.0,45.0,50.0,50.0" style="LinesHeader">
                     <tr>
                         <td>
@@ -456,6 +504,7 @@
             </para>
 
         </pto>
+        <setNextTemplate name="first" />
 
     </story>
 
 
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2016-08-22 13:55:25 +0000
+++ bin/addons/msf_tools/msf_tools.py	2016-10-21 10:36:08 +0000
@@ -395,6 +395,9 @@
         base_obj = self.pool.get(base_object)
         dest_obj = self.pool.get(dest_object)
         seq_obj = self.pool.get('ir.sequence')
+        audit_obj = self.pool.get('audittrail.rule')
+
+        to_trace = dest_obj.check_audit(cr, uid, 'write')
 
         # find the corresponding base ids
         base_ids = [x[foreign_field][0] for x in dest_obj.read(cr, uid, ids, [foreign_field], context=context) if x[foreign_field]]
@@ -420,6 +423,11 @@
                     # numbering value
                     start_num = start_num+1
                     if item_data[i][seq_field] != start_num:
+                        # Create the audittrail log line if the object is traceable
+                        if to_trace:
+                            previous_values = dest_obj.read(cr, uid, [item_data[i]['id']], [seq_field], context=context)
+                            audit_obj.audit_log(cr, uid, to_trace, dest_obj, [item_data[i]['id']], 'write', previous_values, {item_data[i]['id']: {seq_field: start_num}}, context=context)
+
                         cr.execute("update "+dest_obj._table+" set "+seq_field+"=%s where id=%s", (start_num, item_data[i]['id']))
                         #dest_obj.write(cr, uid, [item_data[i]['id']], {seq_field: start_num}, context=context)
 
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-08-23 12:54:03 +0000
+++ bin/addons/sourcing/sale_order_line.py	2016-10-21 10:36:08 +0000
@@ -394,6 +394,41 @@
 
         return res
 
+    def _src_line_values(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns all field order lines that match with the order category or priority
+        domain given in args.
+
+        :param cr: Cursor to the database
+        :param uid: ID of the user that runs the method
+        :param obj: Object on which the search is
+        :param field_name: Name of the field on which the search is
+        :param args: The domain
+        :param context: Context of the call
+
+        :return A list of tuples that allows the system to return the list
+                 of matching field order lines
+        :rtype list
+        """
+        if context is None:
+            context = {}
+
+        if not args:
+            return []
+
+        domain = [('active', 'in', ['t', 'f'])]
+        for arg in args:
+            if arg[0] == 'categ':
+                domain.append(('categ', arg[1], arg[2]))
+            elif arg[0] == 'priority':
+                domain.append(('priority', arg[1], arg[2]))
+
+        order_ids = self.pool.get('sale.order').search(cr, uid, domain, context=context)
+        if order_ids:
+            return [('order_id', 'in', order_ids)]
+
+        return []
+
     def _search_need_sourcing(self, cr, uid, obj, name, args, context=None):
         """
         Returns all field order lines that need to be sourced according to the
@@ -511,6 +546,7 @@
         ),
         'priority': fields.function(
             _get_line_values,
+            fnct_search=_src_line_values,
             method=True,
             selection=ORDER_PRIORITY,
             type='selection',
@@ -521,6 +557,7 @@
         ),
         'categ': fields.function(
             _get_line_values,
+            fnct_search=_src_line_values,
             method=True,
             selection=ORDER_CATEGORY,
             type='selection',