Merge lp:~openerp-dev/openobject-addons/trunk-opw-581318-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

When paying a Sales Receipt through a payment voucher, the voucher type should be 'receipt' so that
it will be listed under menu "Customer Payment".

Reproduce problem:-

- Create a Sales Receipt for any customer and encode the line
- Validate receipt and click on button 'Pay'
- It will open a payment voucher(with type as 'sale', that's the problem)
- Validate voucher so payment is completed.
- Now if you want to see this voucher from 'Customer Payment', you won't be able
   to see it as 'Customer Payment' menu only displays payment voucher type as 'receipt'.

Code is forward port from 6.1

Thanks
Mayur

=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2012-10-29 09:14:55 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2012-11-07 11:38:22 +0000
@@ -50,7 +50,7 @@
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
-            <field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
+            <field name="context">{'default_type':'receipt', 'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
             <field name="view_id" ref="view_vendor_receipt_form"/>
             <field name="target">current</field>
         </record>