Merge lp:~openerp-dev/openobject-addons/6.1-opw-581318-rha into lp:openobject-addons/6.1

Proposed by Rifakat Husen (OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 7054
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-581318-rha
Merge into: lp:openobject-addons/6.1
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/6.1-opw-581318-rha
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+132697@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,
1. Create a Sales Receipt for any customer and encode the line
2. Validate receipt and click on button 'Pay'
3. It will open a payment voucher(with type as 'sale', that's the problem)
4. Validate voucher so payment is completed.
5. 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'.

Please review this fix.
Thanks,
Rifakat Haradwala

To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

Nice Fix, The propose patch fixes the issue.

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-581318-port-mma/+merge/133220 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7054. By Rifakat Husen (OpenERP)

[FIX] account_voucher: fixed type of payment voucher
for the Sales receipt, payment voucher has type as 'sale' but it should be 'receipt', so that payment voucher does not list under Customer Payments

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2012-01-31 13:36:57 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2012-11-02 13:16:22 +0000
@@ -70,7 +70,7 @@
70 <field name="res_model">account.voucher</field>70 <field name="res_model">account.voucher</field>
71 <field name="view_type">form</field>71 <field name="view_type">form</field>
72 <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>72 <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
73 <field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>73 <field name="context">{'default_type':'receipt', 'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
74 <field name="view_id" ref="view_vendor_receipt_form"/>74 <field name="view_id" ref="view_vendor_receipt_form"/>
75 <field name="target">current</field>75 <field name="target">current</field>
76 </record>76 </record>