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

[Jagdish Panchal (Open ERP)]

Hello,

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

Thanks,
jap

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

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.

Thanks,
Naresh Soni

Unmerged revisions

6935. By Jagdish Panchal (Open ERP) on 2012-08-07

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

=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2012-02-15 16:06:28 +0000
+++ account_anglo_saxon/invoice.py	2012-11-23 12:33:21 +0000
@@ -40,7 +40,7 @@
 
         if inv.type in ('out_invoice','out_refund'):
             for i_line in inv.invoice_line:
-                if i_line.product_id:
+                if i_line.product_id and i_line.product_id.valuation == 'real_time':
                     if inv.type == 'out_invoice':
                         # debit account dacc will be the output account
                         # first check the product, if empty check the category
@@ -87,7 +87,7 @@
                             })
         elif inv.type in ('in_invoice','in_refund'):
             for i_line in inv.invoice_line:
-                if i_line.product_id:
+                if i_line.product_id and i_line.product_id.valuation == 'real_time':
                     if i_line.product_id.type != 'service':
                         # get the price difference account at the product
                         acc = i_line.product_id.property_account_creditor_price_difference and i_line.product_id.property_account_creditor_price_difference.id