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

Proposed by Mayur Maheshwari(OpenERP)
Status: Merged
Merged at revision: 8001
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-opw-581318-port-mma
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
account_voucher/voucher_sales_purchase_view.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-opw-581318-port-mma
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+133220@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
2--- account_voucher/voucher_sales_purchase_view.xml 2012-10-29 09:14:55 +0000
3+++ account_voucher/voucher_sales_purchase_view.xml 2012-11-07 11:38:22 +0000
4@@ -50,7 +50,7 @@
5 <field name="res_model">account.voucher</field>
6 <field name="view_type">form</field>
7 <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
8- <field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
9+ <field name="context">{'default_type':'receipt', 'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
10 <field name="view_id" ref="view_vendor_receipt_form"/>
11 <field name="target">current</field>
12 </record>

Subscribers

People subscribed via source and target branches

to all changes: