Merge lp:~openerp-dev/openobject-addons/6.1-opw-577674-jap into lp:openobject-addons/6.1

Proposed by Jagdish Panchal (Open ERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6935
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-577674-jap
Merge into: lp:openobject-addons/6.1
Diff against target: 21 lines (+2/-2)
1 file modified
account_anglo_saxon/ (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577674-jap
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email:

Description of the change


Steps to Reproduce the issue:

1) Install account_anglo_saxon and sale module.
2) Set product valuation as 'realtime' and stock input and output account.
3) Create Customer Invoice and validate it.
4) Check the Journal Entries there is account move in stock Stock output.

This MP contains fix for this issue


To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Naresh Soni

Unmerged revisions

6935. By Jagdish Panchal (Open ERP)

[FIX] account_anglo_saxon: Fix the problem stock move entry in stok output account when prodcut valution is manual.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_anglo_saxon/'
2--- account_anglo_saxon/ 2012-02-15 16:06:28 +0000
3+++ account_anglo_saxon/ 2012-11-23 12:33:21 +0000
4@@ -40,7 +40,7 @@
6 if inv.type in ('out_invoice','out_refund'):
7 for i_line in inv.invoice_line:
8- if i_line.product_id:
9+ if i_line.product_id and i_line.product_id.valuation == 'real_time':
10 if inv.type == 'out_invoice':
11 # debit account dacc will be the output account
12 # first check the product, if empty check the category
13@@ -87,7 +87,7 @@
14 })
15 elif inv.type in ('in_invoice','in_refund'):
16 for i_line in inv.invoice_line:
17- if i_line.product_id:
18+ if i_line.product_id and i_line.product_id.valuation == 'real_time':
19 if i_line.product_id.type != 'service':
20 # get the price difference account at the product
21 acc = i_line.product_id.property_account_creditor_price_difference and