fixed bug :
* pass purchase account journal on creating invoice when approve purchase order bzr revid: hmo@tinyerp.com-20090123081801-mn3xty37npps24rx
This commit is contained in:
parent
4bd332e92b
commit
464a9f533b
|
@ -289,6 +289,7 @@ class purchase_order(osv.osv):
|
||||||
|
|
||||||
def action_invoice_create(self, cr, uid, ids, *args):
|
def action_invoice_create(self, cr, uid, ids, *args):
|
||||||
res = False
|
res = False
|
||||||
|
journal_obj = self.pool.get('account.journal')
|
||||||
for o in self.browse(cr, uid, ids):
|
for o in self.browse(cr, uid, ids):
|
||||||
il = []
|
il = []
|
||||||
for ol in o.order_line:
|
for ol in o.order_line:
|
||||||
|
@ -305,7 +306,8 @@ class purchase_order(osv.osv):
|
||||||
a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
|
a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
|
||||||
il.append(self.inv_line_create(a,ol))
|
il.append(self.inv_line_create(a,ol))
|
||||||
|
|
||||||
a = o.partner_id.property_account_payable.id
|
a = o.partner_id.property_account_payable.id
|
||||||
|
journal_ids = journal_obj.search(cr, uid, [('type', '=','purchase')], limit=1)
|
||||||
inv = {
|
inv = {
|
||||||
'name': o.partner_ref or o.name,
|
'name': o.partner_ref or o.name,
|
||||||
'reference': "P%dPO%d" % (o.partner_id.id, o.id),
|
'reference': "P%dPO%d" % (o.partner_id.id, o.id),
|
||||||
|
@ -315,6 +317,7 @@ class purchase_order(osv.osv):
|
||||||
'currency_id': o.pricelist_id.currency_id.id,
|
'currency_id': o.pricelist_id.currency_id.id,
|
||||||
'address_invoice_id': o.partner_address_id.id,
|
'address_invoice_id': o.partner_address_id.id,
|
||||||
'address_contact_id': o.partner_address_id.id,
|
'address_contact_id': o.partner_address_id.id,
|
||||||
|
'journal_id': len(journal_ids) and journal_ids[0] or False,
|
||||||
'origin': o.name,
|
'origin': o.name,
|
||||||
'invoice_line': il,
|
'invoice_line': il,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue