Add invoice number to analytic line

bzr revid: ced-648a0b3b41f85d7e1c6cf1a6f948c649c703b8ed

addons/account/invoice.py

@@ -273,7 +273,7 @@ class account_invoice(osv.osv):
 			if inv['project_id']:
 				for il in iml:
 					il['analytic_lines'] = [(0,0, {
-						'name': il['name'],
+						'name': inv['number']+' - '+il['name'],
 						'date': time.strftime('%Y-%m-%d'),
 						'account_id': inv['project_id'],
 						'unit_amount': il['quantity'],

addons/account/report/invoice.rml

@@ -179,7 +179,7 @@
             <para style="P12">[[ '%.2f' % l.price_unit ]]</para>
           </td>
           <td>
-            <para style="P12">[[ '%.2f' % (l.discount or 0.0) ]] </para>
+            <para style="P12">[[ l.discount and '%.2f' % (l.discount) or '' ]] </para>
           </td>
           <td>
             <para style="P12">[[ '%.2f' %l.price_subtotal ]] [[o.currency_id.code ]]</para>