[MERGE] Latest trunk

bzr revid: vta@openerp.com-20130102102415-y104nqzm5dz1is3n
This commit is contained in:
vta vta@openerp.com
2013-01-02 11:24:15 +01:00
@@ -3,7 +3,7 @@
-
!record {model: account.invoice, id: account.demo_invoice_0}:
check_total: 14.0
date_invoice: 2012-06-2
date_invoice: !eval "'%s-06-2' %(datetime.now().year)"
invoice_line:
- account_id : account.a_sale
name: 'Test PC'