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

[FIX] purchase_line_invoice : uncomment origin + clean comment and print

Browse Source 
bzr revid: tfr@openerp.com-20101027090845-g8ery0xmqe8zvver
This commit is contained in:
Thibault Francois
2010-10-27 11:08:45 +02:00
parent 146e284f4e
commit f20e34ac9d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/wizard/purchase_line_invoice.py
+4 -4
View File
@@ -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
}
addons/stock/wizard/stock_partial_move.py
+1 -2
View File
@@ -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):