diff --git a/multicompany_cron.diff b/multicompany_cron.diff
new file mode 100644
index 0000000..e8fa7a5
--- /dev/null
+++ b/multicompany_cron.diff
@@ -0,0 +1,13 @@
+diff -r 7658cd8c2e7f cron.py
+--- a/trytond/trytond/modules/company/cron.py	Fri Oct 02 08:56:51 2015 +0200
++++ b/trytond/trytond/modules/company/cron.py	Mon Nov 23 12:35:33 2015 +0100
+@@ -23,7 +23,8 @@
+         for company in cron.companies:
+             User.write([cron.user], {
+                     'company': company.id,
+-                    'main_company': company.id,
++                    'main_company': (company.parent.id if company.parent
++                        else company.id),
+                     })
+             with Transaction().set_context(company=company.id):
+                 super(Cron, cls)._callback(cron)
diff --git a/series b/series
index 92aaadf..529a1ae 100644
--- a/series
+++ b/series
@@ -82,3 +82,4 @@ issue18801002_1.diff
 #stock_lot_improve_sync_inventory_to_outgoing.diff
 #stock_lot_fix_pick_product_without_outgoing_moves.diff
 #purchase_fix_get_move_done_rounding.diff
+#multicompany_cron.diff