diff --git a/addons/procurement_jit_stock/__init__.py b/addons/procurement_jit_stock/__init__.py
new file mode 100644
index 00000000000..7fce9dc7783
--- /dev/null
+++ b/addons/procurement_jit_stock/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import procurement_jit_stock
diff --git a/addons/procurement_jit_stock/__openerp__.py b/addons/procurement_jit_stock/__openerp__.py
new file mode 100644
index 00000000000..277981c61dc
--- /dev/null
+++ b/addons/procurement_jit_stock/__openerp__.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Just In Time Scheduling with Stock',
+    'version': '1.0',
+    'category': 'Base',
+    'description': """
+    If you install this module, it can make sure that not only
+    the ship of pick-pack-ship will be created in batch, but
+    the pick and the pack also.  (which will dramatically improve performance)
+
+    Will be removed from Saas-6 and will be put in procurement_jit
+    over there, where procurement_jit will depend on stock
+    """,
+    'author': 'OpenERP SA',
+    'website': 'https://www.odoo.com/page/manufacturing',
+    'depends': ['procurement_jit', 'stock'],
+    'data': [],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'auto_install': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement_jit_stock/procurement_jit_stock.py b/addons/procurement_jit_stock/procurement_jit_stock.py
new file mode 100644
index 00000000000..576ca54f45c
--- /dev/null
+++ b/addons/procurement_jit_stock/procurement_jit_stock.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2013 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from openerp.osv import osv
+
+class procurement_order(osv.osv):
+    _inherit = "procurement.order"
+
+    def run(self, cr, uid, ids, context=None):
+        context = context or {}
+        context['procurement_autorun_defer'] = True
+        res = super(procurement_order, self).run(cr, uid, ids, context=context)
+
+        procurement_ids = self.search(cr, uid, [('move_dest_id.procurement_id', 'in', ids)], order='id', context=context)
+
+        if procurement_ids:
+            return self.run(cr, uid, procurement_ids, context=context)
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8fe525fc172..85af75c9cd0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1921,7 +1921,7 @@ class stock_move(osv.osv):
 
     def _create_procurement(self, cr, uid, move, context=None):
         """ This will create a procurement order """
-        return self.pool.get("procurement.order").create(cr, uid, self._prepare_procurement_from_move(cr, uid, move, context=context))
+        return self.pool.get("procurement.order").create(cr, uid, self._prepare_procurement_from_move(cr, uid, move, context=context), context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None: