From f20e34ac9d5e90c6cd014c1ef66f776f945acfee Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Wed, 27 Oct 2010 11:08:45 +0200 Subject: [PATCH] [FIX] purchase_line_invoice : uncomment origin + clean comment and print bzr revid: tfr@openerp.com-20101027090845-g8ery0xmqe8zvver --- addons/purchase/wizard/purchase_line_invoice.py | 8 ++++---- addons/stock/wizard/stock_partial_move.py | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py index 4361093c1da..f57ae82e51f 100644 --- a/addons/purchase/wizard/purchase_line_invoice.py +++ b/addons/purchase/wizard/purchase_line_invoice.py @@ -91,8 +91,8 @@ class purchase_line_invoice(osv.osv_memory): else: pay_term = False inv = { - 'name': multiple_order_invoice_name(orders), #trouver - #'origin': order.name, #origin + 'name': multiple_order_invoice_name(orders), + 'origin': multiple_order_invoice_name(orders), 'type': 'in_invoice', 'reference': multiple_order_invoice_reference(partner, orders), 'account_id': a, @@ -100,8 +100,8 @@ class purchase_line_invoice(osv.osv_memory): 'address_invoice_id': orders[0].partner_address_id.id, 'address_contact_id': orders[0].partner_address_id.id, 'invoice_line': [(6,0,lines_ids)], - 'currency_id' : orders[0].pricelist_id.currency_id.id, #currency form the fist ordes - 'comment': multiple_order_invoice_notes(orders), #concatener les notes + 'currency_id' : orders[0].pricelist_id.currency_id.id, + 'comment': multiple_order_invoice_notes(orders), 'payment_term': pay_term, 'fiscal_position': partner.property_account_position.id } diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py index 673e2080420..ba39f172f22 100644 --- a/addons/stock/wizard/stock_partial_move.py +++ b/addons/stock/wizard/stock_partial_move.py @@ -34,7 +34,6 @@ class stock_partial_move_memory(osv.osv_memory): 'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'), 'move_id' : fields.many2one('stock.move', "Move"), 'wizard_id' : fields.many2one('stock.partial.move', string="Wizard"), - #cas in 'cost' : fields.float("Cost", help="Unit Cost for this product line", readonly=True), 'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", readonly=True), } @@ -45,7 +44,7 @@ class stock_partial_move(osv.osv_memory): _columns = { 'date': fields.datetime('Date', required=True), 'type': fields.char("Type", size=3), - 'product_moves' : fields.one2many('stock.move.memory', 'wizard_id', _('Moves')), + 'product_moves' : fields.one2many('stock.move.memory', 'wizard_id', 'Moves'), } def view_init(self, cr, uid, fields_list, context=None):