Merge remote-tracking branch 'origin/develop' into feature/临时分支

# Conflicts:
#	sf_message/models/sf_message_stock_picking.py

sf_message/models/sf_message_stock_picking.py

@@ -73,7 +73,17 @@ class SFMessageStockPicking(models.Model):
                     contents.append(content)
                 return contents
             else:
-                return self.deal_stock_picking_sfp(message_queue_ids)
+                res = super(SFMessageStockPicking, self)._get_message(message_queue_id)
+                return res
+    def get_special_url(self,id,tmplate_name,special_name,model_id):
+        menu_id = 0
+        action_id = 0
+        if tmplate_name=='调拨入库' and special_name== 'transfer_inventory_special_url':
+            menu_id = self.env.ref('stock.menu_stock_root').id
+            action_id = self.env.ref('stock.action_picking_tree_ready').id
+            return super(SFMessageStockPicking, self).get_url(id, menu_id, action_id,model_id)
+        else:
+            return super(SFMessageStockPicking, self).get_special_url(id, tmplate_name, special_name, model_id)
 
     def request_url(self):
         url = self.env['ir.config_parameter'].get_param('web.base.url')