pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifs

Browse Source 
bzr revid: fp@tinyerp.com-20090315233934-too2v4p5m2hmqmyc
This commit is contained in:
Fabien Pinckaers
2009-03-16 00:39:34 +01:00
parent 032d163217
commit 1ee22210d6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+4 -4
View File
@@ -669,8 +669,8 @@ class stock_picking(osv.osv):
invoice_id = invoices_group[partner.id]
invoice=invoice_obj.browse(cursor, user,invoice_id)
invoice_vals = {
'name': invoice.name +', '+str(picking.name or ''),
'origin': invoice.origin+', '+str(picking.name or '')+(picking.origin and (':' + picking.origin) or ''),
'name': (invoice.name or '') +', '+(picking.name or ''),
'origin': (invoice.origin or '')+', '+(picking.name or '')+(picking.origin and (':' + picking.origin) or ''),
'comment':(comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
}
invoice_obj.write(cursor, user, [invoice_id],invoice_vals,context=context)
@@ -701,7 +701,7 @@ class stock_picking(osv.osv):
if move_line.picking_id.origin:
origin+=':' + move_line.picking_id.origin
if group:
name = str(picking.name or '') + '-' + move_line.name
name = (picking.name or '') + '-' + move_line.name
else:
name = move_line.name
@@ -1015,7 +1015,7 @@ class stock_move(osv.osv):
ptype = self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
pickid = self.pool.get('stock.picking').create(cr, uid, {
'name': picking.name,
'origin': str(picking.origin or ''),
'origin': (picking.origin or ''),
'type': ptype,
'note': picking.note,
'move_type': picking.move_type,