Merge lp:~unifield-team/unifield-wm/bklg-16-17-18-31 into lp:unifield-wm

[jftempo]

Unmerged revisions

2421. By Quentin THEURET @Amaris on 2015-03-23

BKLG-18 [IMP] Fix displaying of number of items

2420. By Quentin THEURET @Amaris on 2015-03-17

BKLG-18 [IMP] Display the total quantity of a line in picking ticket PDF report in bold

2419. By Quentin THEURET @Amaris on 2015-03-17

BKLG-31 [IMP] Rewrite the sourcing document tab of Internal requests

2418. By Quentin THEURET @Amaris on 2015-03-16

BKLG-18 [FIX] Don't display product code and product description on picking ticket report in case of multiple batches

2417. By Quentin THEURET @Amaris on 2015-03-16

BKLG-18 [FIX] Don't display product code and product description on picking ticket report in case of multiple batches

2416. By Quentin THEURET @Amaris on 2015-03-16

BKLG-17 [FIX] Add a warning message when user changes the partner of an Outgoing delivery

2415. By Quentin THEURET @Amaris on 2015-03-16

BKLG-17 [FIX] Make the partner_id2 field of Outgoing delivery readonly because if not, you can choose the instance partner with an external location not consumption unit as destination

2414. By Quentin THEURET @Amaris on 2015-03-13

BKLG-31 [MERGE] Merge lp:~unifield-team/unifield-wm/bklg-31

2413. By Quentin THEURET @Amaris on 2015-03-13

BKLG-18 [MERGE] Merge lp:~unifield-team/unifield-wm/bklg-18

2412. By Quentin THEURET @Amaris on 2015-03-13

BKLG-17 [MERGE] Merge lp:~unifield-team/unifield-wm/bklg-17

=== modified file 'account_override/account.py'
=== modified file 'analytic_distribution/wizard/analytic_distribution_wizard.py'
=== modified file 'msf_outgoing/msf_outgoing.py'
=== modified file 'msf_outgoing/report/picking_ticket.py'
--- msf_outgoing/report/picking_ticket.py	2014-08-05 15:13:19 +0000
+++ msf_outgoing/report/picking_ticket.py	2015-03-24 09:41:54 +0000
@@ -20,11 +20,29 @@
 ##############################################################################
 
 import time
+import pooler
 from osv import osv
 from tools.translate import _
 from report import report_sxw
 
 
+class BatchMoveLines(object):
+
+    def __init__(self, move):
+        self.move = move
+        self.location_id = move.location_id
+        self.product_id = move.product_id
+        self.line_number = move.line_number
+        self.sale_line_id = move.sale_line_id
+        self.product_uom = move.product_id.uom_id
+        self.product_qty = 0.00
+        self.prodlot_id = None
+        self.kc_check = False
+        self.dg_check = False
+        self.np_check = False
+        self.no_product = False
+
+
 class picking_ticket(report_sxw.rml_parse):
     """
     Parser for the picking ticket report
@@ -47,8 +65,62 @@
             'uid': uid,
             'getWarningMessage': self.get_warning,
             'getStock': self.get_qty_available,
+            'getNbItems': self.get_nb_items,
+            'getLines': self.get_lines,
         })
 
+    def get_lines(self, picking):
+        """
+        Returns the move lines. For move lines with a batch number/expiry date
+        create a first line with the whole quantity of product in stock, then
+        one line for each batch with the quantity of batch in stock.
+        """
+        res = []
+        dict_res = {}
+        pool = pooler.get_pool(self.cr.dbname)
+
+        for m in picking.move_lines:
+            dict_res.setdefault(m.line_number, [])
+            if m.prodlot_id and not dict_res[m.line_number]:
+                # First create a line without batch
+                dict_res[m.line_number].append(BatchMoveLines(m))
+            bm = BatchMoveLines(m)
+            bm.product_uom = m.product_uom
+            bm.product_qty = m.product_qty
+            bm.prodlot_id = m.prodlot_id
+            bm.kc_check = m.kc_check
+            bm.dg_check = m.dg_check
+            bm.np_check = m.np_check
+            if m.prodlot_id and dict_res[m.line_number]:
+                bm.no_product = True
+                dict_res[m.line_number][0].product_qty += pool.get('product.uom')._compute_qty(
+                    self.cr, self.uid, bm.product_uom.id, bm.product_qty, bm.product_id.uom_id.id)
+            dict_res[m.line_number].append(bm)
+
+        for key in dict_res:
+            for m in dict_res[key]:
+                res.append(m)
+
+        return res
+
+    def get_nb_items(self, picking):
+        """
+        Returns the number of different line number. If a line is split
+        with a different product, this line count for +1
+        """
+        res = 0
+        dict_res = {}
+        for m in picking.move_lines:
+            dict_res.setdefault(m.line_number, {})
+            if m.product_id.id not in dict_res[m.line_number]:
+                dict_res[m.line_number][m.product_id.id] = 1
+
+        for ln in dict_res.values():
+            for p in ln.values():
+                res += p
+
+        return res
+
     def get_warning(self, picking):
         """
         If the picking ticket contains heat sensitive, dangerous goods or both,
@@ -100,6 +172,7 @@
             context = {
                 'location': move.location_id.id,
                 'location_id': move.location_id.id,
+                'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
             }
 
         qty_available = product_obj.browse(

=== modified file 'msf_outgoing/report/picking_ticket.rml'
--- msf_outgoing/report/picking_ticket.rml	2014-10-23 15:26:10 +0000
+++ msf_outgoing/report/picking_ticket.rml	2015-03-24 09:41:54 +0000
@@ -11,7 +11,7 @@
                 <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>
+                <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" />
                 <drawString x="20.0" y="525.0">Page : <pageNumber /> / </drawString>
@@ -101,6 +101,7 @@
         <paraStyle name="LineHeaderLeft" fontName="Helvetica-Oblique" fontSize="6.0" alignment="LEFT" leading="5.0" />
 
         <paraStyle name="LineValue" fontName="Helvetica" fontSize="6.0" alignment="CENTER" leading="5.0" textColor="blue" />
+        <paraStyle name="LineValueBold" fontName="Helvetica-Bold" fontSize="8.0" alignment="CENTER" leading="5.0" textColor="blue" />
         <paraStyle name="LineValueLeft" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="5.0" textColor="blue" />
 
 
@@ -132,7 +133,7 @@
                     <para style="HeaderInfosValue">[[ pt.sale_id and pt.sale_id.name or '-' ]]</para>
                     <para style="HeaderInfosValue">[[ pt.sale_id and pt.sale_id.client_order_ref and pt.sale_id.client_order_ref or '-' ]]</para>
                     <para style="HeaderInfosValue">[[ pt.sale_id and getSel(pt.sale_id, 'categ') or '-' ]]</para>
-                    <para style="HeaderInfosValue">[[ len(pt.move_lines) or 0 ]]</para>
+                    <para style="HeaderInfosValue">[[ getNbItems(pt) ]]</para>
                 </td>
                 <td>
                     <para style="HeaderInfosTitle"></para>
@@ -356,25 +357,26 @@
 
             <!-- Lines -->
             <blockTable colWidths="30.0,120.0,240.0,55.0,55.0,55.0,55.0,75.0,65.0,20.0,20.0,20.0" rowHeights="15.0" style="LinesValues">
-                [[ repeatIn(pt.move_lines, 'm', 'blockTable') ]]
+                [[ repeatIn(getLines(pt), 'm', 'blockTable') ]]
                 <tr>
                     <td>
-                        <para style="LineValue">[[ m.line_number ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.product_id.default_code or m.product_id.default_code ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.product_id.name or m.product_id.name ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ formatLang(getStock(m) or 0.00) ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ m.product_uom.name ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ m.product_qty and m.product_qty or 0.00 ]]</para>
+                        <para style="LineValue">[[ not m.no_product and m.line_number or '' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValueLeft">[[ not m.no_product and (m.sale_line_id and m.sale_line_id.product_id.default_code or m.product_id.default_code) or '' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValueLeft">[[ not m.no_product and (m.sale_line_id and m.sale_line_id.product_id.name or m.product_id.name) or '']]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ formatLang(getStock(m) or 0.00, digits=get_digits(dp='Product UoM')) ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ m.product_id.uom_id.name ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ m.no_product and formatLang(m.product_qty, digits=get_digits(dp='Product UoM')) or removeParentNode('para') ]]</para>
+                        <para style="LineValueBold">[[ not m.no_product and formatLang(m.product_qty, digits=get_digits(dp='Product UoM')) or removeParentNode('para') ]]</para>
                     </td>
                     <td>
                         <para style="LineValue"> </para>
@@ -400,7 +402,7 @@
                         <para style="LineValue"></para>
                     </td>
                     <td>
-                        <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.note or '' ]]</para>
+                        <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.notes or '' ]]</para>
                     </td>
                     <td>
                         <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.product_id != m.product_id and '[%s] %s' % (m.product_id.default_code, m.product_id.name) or '' ]]</para>

=== modified file 'msf_partner/partner.py'
=== modified file 'sale_override/sale.py'
=== modified file 'sourcing/procurement_order.py'
=== modified file 'stock_override/stock.py'
=== modified file 'stock_override/stock_view.xml'
=== modified file 'tender_flow/tender_flow.py'