Merge lp:~openerp-dev/openobject-addons/trunk-bug-1090136-dhr into lp:openobject-addons

[Dharti Ratani(OpenERP)]

Hello,

     Solved integrity error while updating product's cost with costing method="Average" from update wizard.

Thanks.

Unmerged revisions

8357. By Dharti Ratani(OpenERP) on 2012-12-17

[FIX]Solved Integrity error while update product cost though update wizard

=== modified file 'stock/product.py'
--- stock/product.py	2012-11-29 22:26:45 +0000
+++ stock/product.py	2012-12-17 09:46:21 +0000
@@ -22,6 +22,7 @@
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+from datetime import datetime
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -126,7 +127,7 @@
                                 'journal_id': journal_id,
                                 'company_id': company_id
                                 })
-
+                    
                     move_ids.append(move_id)
 
 
@@ -149,12 +150,14 @@
                                     'account_id': stock_input_acc,
                                     'debit': amount_diff,
                                     'move_id': move_id,
+                                    'date':datetime.now().strftime('%Y-%m-%d')
                                     })
                         move_line_obj.create(cr, uid, {
                                     'name': product.categ_id.name,
                                     'account_id': account_valuation_id,
                                     'credit': amount_diff,
-                                    'move_id': move_id
+                                    'move_id': move_id,
+                                    'date':datetime.now().strftime('%Y-%m-%d')
                                     })
                     elif diff < 0:
                         if not stock_output_acc:
@@ -174,13 +177,15 @@
                                         'name': product.name,
                                         'account_id': stock_output_acc,
                                         'credit': amount_diff,
-                                        'move_id': move_id
+                                        'move_id': move_id,
+                                        'date':datetime.now().strftime('%Y-%m-%d')
                                     })
                         move_line_obj.create(cr, uid, {
                                         'name': product.categ_id.name,
                                         'account_id': account_valuation_id,
                                         'debit': amount_diff,
-                                        'move_id': move_id
+                                        'move_id': move_id,
+                                        'date': datetime.now().strftime('%Y-%m-%d')
                                     })
 
             self.write(cr, uid, rec_id, {'standard_price': new_price})