From a8a21fab1acc1d9dcaab2eb35a126274be4cd846 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 21 Jun 2007 15:09:18 +0000
Subject: [PATCH] Demo data for departments Removed references to VAT in all
 modules Added vat in l10n_euro module Make some account chart modules
 depending on l10n_euro Better menu for Administration/Users

bzr revid: fp@tinyerp.com-cb44ba7d06053ed468405613f08e47d23b2c3350
---
 addons/hr/__terp__.py                 |  6 ++-
 addons/hr/hr.py                       |  1 -
 addons/hr/hr_department_demo.xml      | 63 +++++++++++++++++++++++++++
 addons/hr/hr_department_view.xml      |  4 +-
 addons/hr/hr_view.xml                 |  2 +-
 addons/l10n_ch/__terp__.py            |  2 +-
 addons/l10n_chart_be_frnl/__terp__.py |  2 +-
 addons/l10n_chart_it/__terp__.py      |  2 +-
 addons/l10n_chart_sp/__terp__.py      |  2 +-
 addons/l10n_euro/base_data.xml        | 14 ++++++
 addons/l10n_fr/__terp__.py            |  2 +-
 11 files changed, 90 insertions(+), 10 deletions(-)
 create mode 100644 addons/hr/hr_department_demo.xml

diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index 68f0e4eaf8a..2064c024c3f 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -15,7 +15,11 @@
 	""",
 	"depends" : ["base"],
 	"init_xml" : [],
-	"demo_xml" : ["hr_demo.xml", "hr_bel_holidays_2005.xml"],
+	"demo_xml" : [
+		"hr_demo.xml", 
+		"hr_bel_holidays_2005.xml",
+		"hr_department_demo.xml"
+	],
 	"update_xml" : [
 		"hr_view.xml", 
 		"hr_report.xml", 
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index aa99c854a5f..5bd0b259971 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -123,7 +123,6 @@ class hr_employee(osv.osv):
 		'holiday_max' : fields.integer("Number of holidays"),
 		'parent_id': fields.many2one('hr.employee', 'Boss', select=True),
 		'child_ids': fields.one2many('hr.employee', 'parent_id','Subordinates'),
-		'bank_account': fields.char("Bank Account", size=16),
 	}
 	_defaults = {
 		'active' : lambda *a: True,
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
new file mode 100644
index 00000000000..7912297da4c
--- /dev/null
+++ b/addons/hr/hr_department_demo.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<terp>
+	<data noupdate="1">
+
+		<record model="hr.department" id="dep_management">
+			<field name="name">Management</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+		</record>
+		<record model="hr.department" id="dep_administration">
+			<field name="name">Administration</field>
+			<field name="parent_id" ref="dep_management"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+		</record>
+
+		<record model="hr.department" id="dep_technical">
+			<field name="name">Technical department</field>
+			<field name="parent_id" ref="dep_management"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+		</record>
+
+		<record model="hr.department" id="dep_it">
+			<field name="name">IT</field>
+			<field name="parent_id" ref="dep_technical"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+		</record>
+
+		<record model="hr.department" id="dep_marketing">
+			<field name="name">Marketing</field>
+			<field name="parent_id" ref="dep_management"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+		</record>
+
+		<record model="hr.department" id="dep_sales">
+			<field name="name">Sales</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+			<field name="parent_id" ref="dep_management"/>
+		</record>
+
+		<record model="hr.department" id="dep_sales_europe">
+			<field name="name">Sales Europe</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+			<field name="parent_id" ref="dep_sales"/>
+		</record>
+
+		<record model="hr.department" id="dep_sales_america">
+			<field name="name">Sales America</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="manager_id" ref="base.user_admin" />
+			<field name="parent_id" ref="dep_sales"/>
+		</record>
+
+
+
+
+	</data>
+</terp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 0858e573e06..0eb79584f9e 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -46,7 +46,7 @@
 		<field name="view_type">tree</field>
 		<field name="domain">[('parent_id','=',False)]</field>
 	</record>
-	<menuitem name="Human Resources/Configuration/Departments"
+	<menuitem name="Administration/Users/Departments structure"
 		action="open_module_tree_department_tree" 
 		id="menu_department_tree"/>
 
@@ -56,7 +56,7 @@
 		<field name="view_type">form</field>
 	</record>
 
-	<menuitem name="Human Resources/Configuration/Departments/Define departments"
+	<menuitem name="Administration/Users/Departments structure/Define departments"
 		action="open_module_tree_department" 
 		id="menu_department_def"/>
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 63d6c7b74dd..6cca603b906 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -31,7 +31,7 @@
 							<field name="workgroups" colspan="4" />
 							<field name="state"/>
 							<field name="parent_id" select="1"/>
-							<field name="bank_account"/>
+							<field name="category_id"/>
 							<group colspan="2" col="2">
 								<button string="Sign in !" name="sign_in" states="absent" type="object" />
 								<button string="Sign out !" name="sign_out" states="present" type="object" />
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index a0efec7bda8..d2445a91dc8 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -7,7 +7,7 @@
 	"author" : "Camptocamp",
 	"category" : "Localisation/Europe",
 	"website": "http://www.tinyerp.com",
-	"depends" : ["base", "account", "account_cash_discount",],
+	"depends" : ["base", "account", "account_cash_discount", "l10n_euro"],
 	"init_xml" : ["dta/dta_data.xml", "vaudtax_data.xml"], #, "zip_code_default.xml",],
 	"demo_xml" : ["vaudtax_data_demo.xml","dta/dta_demo.xml"],
 	"update_xml" : [
diff --git a/addons/l10n_chart_be_frnl/__terp__.py b/addons/l10n_chart_be_frnl/__terp__.py
index e2ffd401565..ffa2b8e9400 100644
--- a/addons/l10n_chart_be_frnl/__terp__.py
+++ b/addons/l10n_chart_be_frnl/__terp__.py
@@ -6,7 +6,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account","l10n_euro"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,
diff --git a/addons/l10n_chart_it/__terp__.py b/addons/l10n_chart_it/__terp__.py
index d7b123d3ae6..e4d155485c0 100644
--- a/addons/l10n_chart_it/__terp__.py
+++ b/addons/l10n_chart_it/__terp__.py
@@ -6,7 +6,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account","l10n_euro"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,
diff --git a/addons/l10n_chart_sp/__terp__.py b/addons/l10n_chart_sp/__terp__.py
index 3d355da7e26..34f606d5624 100644
--- a/addons/l10n_chart_sp/__terp__.py
+++ b/addons/l10n_chart_sp/__terp__.py
@@ -6,7 +6,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account","l10n_euro"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,
diff --git a/addons/l10n_euro/base_data.xml b/addons/l10n_euro/base_data.xml
index db002744ef4..2835ed87924 100644
--- a/addons/l10n_euro/base_data.xml
+++ b/addons/l10n_euro/base_data.xml
@@ -17,6 +17,20 @@
 		</field>
 	</record>
 
+	<record model="ir.ui.view" id="view_partner_form">
+		<field name="name">res.partner.bank.vat.inherit</field>
+		<field name="model">res.partner.bank.vat</field>
+		<field name="inherit_id" ref="base.view_partner_form"/>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<page string="Extra Info" position="inside">
+				<field name="vat"/>
+				<newline/>
+			</page>
+		</field>
+	</record>
+
+
 	# --------------------------------------------------------------
 	# Default bank account description
 	# --------------------------------------------------------------
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__terp__.py
index a33aa7d179d..a947cbd3d7c 100644
--- a/addons/l10n_fr/__terp__.py
+++ b/addons/l10n_fr/__terp__.py
@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account"],
+	"depends" : ["base", "account", "l10n_euro"],
 	"init_xml" : [],
 	"demo_xml" : [],
 	"update_xml" : ["account_pcg_france.xml"],