From 3e2e9ae6d39f6cf99402fa84849f9d3755395f3e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 28 Mar 2007 15:03:13 +0000
Subject: [PATCH] MULTI_COMPANY_PROJECT,MULTI_COMPANY_HR_TIMESHEET_SHEET: new
 modules

bzr revid: mga@tinyerp.com-217e536931c598aecee85f859e9beaec437b2022
---
 addons/multi_company/__init__.py                     |  2 --
 addons/multi_company/__terp__.py                     |  4 ++--
 addons/multi_company_hr_timesheet_sheet/__init__.py  |  1 +
 addons/multi_company_hr_timesheet_sheet/__terp__.py  | 12 ++++++++++++
 .../multi_company_hr_timesheet_sheet.py}             |  0
 .../multi_company_hr_timesheet_sheet_view.xml}       |  0
 addons/multi_company_project/__init__.py             |  1 +
 addons/multi_company_project/__terp__.py             | 12 ++++++++++++
 .../multi_company_project.py}                        |  0
 .../multi_company_project_view.xml}                  |  0
 10 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 addons/multi_company_hr_timesheet_sheet/__init__.py
 create mode 100644 addons/multi_company_hr_timesheet_sheet/__terp__.py
 rename addons/{multi_company/hr.py => multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py} (100%)
 rename addons/{multi_company/hr_view.xml => multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_view.xml} (100%)
 create mode 100644 addons/multi_company_project/__init__.py
 create mode 100644 addons/multi_company_project/__terp__.py
 rename addons/{multi_company/project.py => multi_company_project/multi_company_project.py} (100%)
 rename addons/{multi_company/project_view.xml => multi_company_project/multi_company_project_view.xml} (100%)

diff --git a/addons/multi_company/__init__.py b/addons/multi_company/__init__.py
index 0469067664e..e69de29bb2d 100644
--- a/addons/multi_company/__init__.py
+++ b/addons/multi_company/__init__.py
@@ -1,2 +0,0 @@
-import project
-import hr
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
index a62edaa31cb..c65f6d573dd 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/multi_company/__terp__.py
@@ -2,11 +2,11 @@
 	"name" : "Multi company base module",
 	"version" : "0.1",
 	"author" : "Tiny",
-	"depends" : ["project", "hr_timesheet_sheet"],
+	"depends" : ["base",],
 	"category" : "Generic Modules/Base",
 	"init_xml" : [],
 	"demo_xml" : ["multi_company_demo.xml",],
-	"update_xml" : ["project_view.xml","hr_view.xml"],
+	"update_xml" : [],
 	"active": False,
 	"installable": True
 }
diff --git a/addons/multi_company_hr_timesheet_sheet/__init__.py b/addons/multi_company_hr_timesheet_sheet/__init__.py
new file mode 100644
index 00000000000..5ac72900e94
--- /dev/null
+++ b/addons/multi_company_hr_timesheet_sheet/__init__.py
@@ -0,0 +1 @@
+import multi_company_hr_timesheet_sheet
diff --git a/addons/multi_company_hr_timesheet_sheet/__terp__.py b/addons/multi_company_hr_timesheet_sheet/__terp__.py
new file mode 100644
index 00000000000..74ca416e991
--- /dev/null
+++ b/addons/multi_company_hr_timesheet_sheet/__terp__.py
@@ -0,0 +1,12 @@
+{
+	"name" : "Multi company Human Resources (Timesheet groups)",
+	"version" : "0.1",
+	"author" : "Tiny",
+	"category" : "Generic Modules/Human Resources",
+	"depends" : ["hr_timesheet_sheet","base", 'multi_company',],
+	"init_xml" : [],
+	"demo_xml" : [],
+	"update_xml" : ["multi_company_hr_timesheet_sheet_view.xml",],
+	"active": False,
+	"installable": True
+}
diff --git a/addons/multi_company/hr.py b/addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py
similarity index 100%
rename from addons/multi_company/hr.py
rename to addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py
diff --git a/addons/multi_company/hr_view.xml b/addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_view.xml
similarity index 100%
rename from addons/multi_company/hr_view.xml
rename to addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_view.xml
diff --git a/addons/multi_company_project/__init__.py b/addons/multi_company_project/__init__.py
new file mode 100644
index 00000000000..a355a1361f3
--- /dev/null
+++ b/addons/multi_company_project/__init__.py
@@ -0,0 +1 @@
+import multi_company_project
diff --git a/addons/multi_company_project/__terp__.py b/addons/multi_company_project/__terp__.py
new file mode 100644
index 00000000000..2766d608091
--- /dev/null
+++ b/addons/multi_company_project/__terp__.py
@@ -0,0 +1,12 @@
+{
+	"name" : "Multi company Project Management",
+	"version": "0.1",
+	"author" : "Tiny",
+	"category" : "Generic Modules/Projects & Services",
+	"depends" : ['project', 'base', 'multi_company',],
+	"init_xml" : [],
+	"demo_xml" : [],
+	"update_xml": ['multi_company_project_view.xml',],
+	"active": False,
+	"installable": True
+}
diff --git a/addons/multi_company/project.py b/addons/multi_company_project/multi_company_project.py
similarity index 100%
rename from addons/multi_company/project.py
rename to addons/multi_company_project/multi_company_project.py
diff --git a/addons/multi_company/project_view.xml b/addons/multi_company_project/multi_company_project_view.xml
similarity index 100%
rename from addons/multi_company/project_view.xml
rename to addons/multi_company_project/multi_company_project_view.xml