Merge lp:~openerp-dev/openobject-addons/7.0-opw-594333-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

Steps to reproduce:

When updating the standard price of a product with the wizard "update price", the code in stock/product.py creates accounting moves to reflect this change in accounting, regardless of the valuation setting of the product.

I have fix this issue that creates accounting moves when valuation='real_time', not when valuation='manual_periodic' and remove required valuation accounts on product categories when valuation = 'manual_periodic'.

Thanks,
FKA

Unmerged revisions

9279. By Foram Katharotiya (OpenERP) on 2013-07-31

[IMP] made require valuation accounts on product categorie when we use realtime valuation

9278. By Foram Katharotiya (OpenERP) on 2013-07-31

[MERGE] with 7.0

9277. By Foram Katharotiya (OpenERP) on 2013-07-01

[IMP] create accounting moves when valuation is 'real_time'

=== modified file 'stock/product.py'
--- stock/product.py	2013-04-17 13:20:21 +0000
+++ stock/product.py	2013-08-01 05:31:31 +0000
@@ -93,7 +93,7 @@
         product_obj=self.browse(cr, uid, ids, context=context)[0]
         account_valuation = product_obj.categ_id.property_stock_valuation_account_id
         account_valuation_id = account_valuation and account_valuation.id or False
-        if not account_valuation_id: raise osv.except_osv(_('Error!'), _('Specify valuation Account for Product Category: %s.') % (product_obj.categ_id.name))
+        if product_obj.valuation == 'real_time' and not account_valuation_id: raise osv.except_osv(_('Error!'), _('Specify valuation Account for Product Category: %s.') % (product_obj.categ_id.name))
         move_ids = []
         loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
         for rec_id in ids:
@@ -108,7 +108,7 @@
                 qty = product.qty_available
                 diff = product.standard_price - new_price
                 if not diff: raise osv.except_osv(_('Error!'), _("No difference between standard price and new price!"))
-                if qty:
+                if qty and product.valuation == 'real_time':
                     company_id = location.company_id and location.company_id.id or False
                     if not company_id: raise osv.except_osv(_('Error!'), _('Please specify company in Location.'))
                     #