Merge lp:~serpent-consulting-services/openerp-usa/fix-1056023-SerpentCS into lp:openerp-usa/6.0

[Serpent Consulting Services]

=== modified file 'account_voucher_credits_us/voucher_view.xml'
--- account_voucher_credits_us/voucher_view.xml	2012-06-18 14:26:40 +0000
+++ account_voucher_credits_us/voucher_view.xml	2012-09-25 08:43:26 +0000
@@ -58,7 +58,6 @@
 							<field name="pay" on_change="onchange_pay(amount, pay, amount_unreconciled, parent.line_cr_ids, parent.amount, 
 							                                          credit_used, discount_used, writeoff_amount)"/>
                             <field name="amount" sum="Payment"/>
-                            <field name="discount" />
 							<field name="amount_difference"/>
 							<field name="credit_used"/>
 							<field name="account_id"/>