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
This commit is contained in:
Fabien Pinckaers 2007-06-21 15:09:18 +00:00
parent 2c26af607d
commit a8a21fab1a
11 changed files with 90 additions and 10 deletions

View File

@ -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",

View File

@ -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,

View File

@ -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>

View File

@ -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"/>

View File

@ -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" />

View File

@ -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" : [

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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
# --------------------------------------------------------------

View File

@ -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"],