Merge lp:~unifield-team/unifield-wm/sync_uf2186_logger_issue into lp:unifield-wm/sync

[jftempo]

=== modified file 'sync_client/log_sale_purchase.py'
--- sync_client/log_sale_purchase.py	2013-11-11 15:55:09 +0000
+++ sync_client/log_sale_purchase.py	2013-11-24 11:48:19 +0000
@@ -84,6 +84,7 @@
             fields.reference("Document", selection=[
                 ('sale.order','Sale Order'),
                 ('purchase.order','Field Order'),
+                ('stock.picking','Picking'),
             ], size=128, required=True, readonly=True),
         'model' :
             fields.function(_get_model_from_document, method=True,

=== modified file 'sync_so/picking.py'
--- sync_so/picking.py	2013-11-11 12:25:20 +0000
+++ sync_so/picking.py	2013-11-24 11:48:19 +0000
@@ -19,20 +19,15 @@
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
-from osv import orm
-from tools.translate import _
-from datetime import datetime
-import tools
-import time
+from osv import osv, fields
 import netsvc
-import so_po_common
+
+import logging
+
 from sync_common import xmlid_to_sdref
-import logging
-
 from sync_client import get_sale_purchase_logger
 
+
 class stock_picking(osv.osv):
     '''
     synchronization methods related to stock picking objects
@@ -601,7 +596,7 @@
                     cr, uid,
                     context['changes']['stock.move'].keys(),
                     context=context):
-                lines.setdefault(rec_line.id, {})[rec_line.id] = \
+                lines.setdefault(rec_line.picking_id.id, {})[rec_line.id] = \
                      context['changes']['stock.move'][rec_line.id]
         # monitor changes on purchase.order
         for id, changes in changes.items():