Merge lp:~openerp-dev/openobject-addons/trunk-bug-1244368-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

    I have fixed this bug "canceled inventory does not reverse the GL entries".

Thanks,
Chirag Dodiya(cod).

Unmerged revisions

9022. By Chirag Dodiya(OpenERP) on 2013-12-20

[MRG] Merge with lp:openobject-addons

9021. By Chirag Dodiya(OpenERP) on 2013-12-20

[IMP] Improved code to fix yml error

9020. By Chirag Dodiya(OpenERP) on 2013-12-19

[FIX] Fixed this bug:canceled inventory does not reverse the GL entries

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-12-18 15:57:15 +0000
+++ stock/stock.py	2013-12-20 09:35:23 +0000
@@ -2362,7 +2362,7 @@
                         {
                          'journal_id': j_id,
                          'line_id': move_lines,
-                         'ref': move.picking_id and move.picking_id.name}, context=context)
+                         'ref': move.picking_id and move.picking_id.name or move.name}, context=context)
 
     def action_done(self, cr, uid, ids, context=None):
         """ Makes the move done and if all moves are done, it will finish the picking.
@@ -2881,7 +2881,7 @@
         for inv in self.browse(cr, uid, ids, context=context):
             move_obj.action_cancel(cr, uid, [x.id for x in inv.move_ids], context=context)
             for move in inv.move_ids:
-                 account_move_ids = account_move_obj.search(cr, uid, [('name', '=', move.name)])
+                 account_move_ids = account_move_obj.search(cr, uid, [('ref', '=', move.name)])
                  if account_move_ids:
                      account_move_data_l = account_move_obj.read(cr, uid, account_move_ids, ['state'], context=context)
                      for account_move in account_move_data_l: