[MERGE] lp:930209

bzr revid: qdp-launchpad@openerp.com-20120823073047-xizjutknmt8qrtm6
This commit is contained in:
Quentin (OpenERP)
2012-08-23 09:30:47 +02:00
2 changed files with 0 additions and 22 deletions
-7
View File
@@ -29,14 +29,7 @@ class picking(report_sxw.rml_parse):
super(picking, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
'get_qtytotal':self._get_qtytotal
})
def _get_qtytotal(self,move_lines):
total = 0.0
uom = move_lines[0].product_uom.name
for move in move_lines:
total+=move.product_qty
return {'quantity':total,'uom':uom}
report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-15
View File
@@ -299,21 +299,6 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="388.0,56.0,77.0" style="Table2">
<tr>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Total</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>