merging from trunk

bzr revid: mga@tinyerp.com-20081215115040-ey5cpbungsdf8mdg
This commit is contained in:
Mantavya Gajjar
2008-12-15 17:20:40 +05:30
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -273,7 +273,7 @@ class account_move_line(osv.osv):
while i < len(args):
fargs = args[i][0].split('.', 1)
if len(fargs) > 1:
args[i] = (frags[0], 'in', invoice_obj.search(cursor, user,
args[i] = (fargs[0], 'in', invoice_obj.search(cursor, user,
[(fargs[1], args[i][1], args[i][2])]))
i += 1
continue
+4
View File
@@ -839,6 +839,10 @@ class account_invoice(osv.osv):
'ref':invoice.number,
}
name = invoice.invoice_line[0].name
l1['name'] = name
l2['name'] = name
lines = [(0, 0, l1), (0, 0, l2)]
move = {'ref': invoice.number, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
move_id = self.pool.get('account.move').create(cr, uid, move)