odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improved views 

bzr revid: fp@tinyerp.com-20100216064851-6rapc0a0kk1yzwql
This commit is contained in:
Fabien Pinckaers 2010-02-16 07:48:51 +01:00
parent 5c8360f999
commit 1f40de2750
4 changed files with 93 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/crm/crm_lead_view.xml
View File

@ -26,25 +26,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leads Form">
<group colspan="4" col="4">
<group colspan="4" col="6">
<field name="partner_name" string="Lead Name" required="1"/>
<field name="name" string="Lead Subject"/>
<button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>
<field name="partner_name2" string="Contact Name"/>
<field name="email_from" string="Email"/>
<newline/>
<group colspan="4" col="5">
<label string="" colspan="2"/>
<button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>
<button string="Convert to Partner"
icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
/>
</group>
</group>
<group colspan="4" col="4">
<notebook>
<notebook colspan="4">
<page string="Leads">
<separator colspan="4" string="Communication"/>
<field name="partner_id" string="Partner"
@ -54,7 +47,7 @@
on_change="onchange_partner_address_id(partner_address_id, email_from)" />
<field name="partner_phone"/>
<field name="partner_mobile"/>
<separator colspan="4" string="Status and Categarization"/>
<separator colspan="4" string="Status and Categorization"/>
<group colspan="4" col="6">
<field name="user_id" select="2"/>
<field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
@ -111,7 +104,6 @@
type="action" />
</page>
</notebook>
</group>
</form>
</field>
</record>

21
addons/hr/hr_department_view.xml
View File

@ -13,10 +13,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="department">
<group col="6" colspan="4">
<field colspan="4" name="name" select="1"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="parent_id" select="2"/>
<field colspan="4" name="manager_id" select="1"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4" >
<page string="Members">
<field colspan="4" name="member_ids" nolabel="1"/>
@ -57,23 +59,6 @@
<menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
<!-- res.users inherit -->
<record model="ir.ui.view" id="view_users_form_inherit">
<field name="name">res.users.form</field>
<field name="type">form</field>
<field name="model">res.users</field>
<field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Departements Informations">
<separator string="Managers" colspan="4"/>
<field name="parent_id" nolabel="1" colspan="4"/>
<separator string="Subordinates" colspan="4"/>
<field name="child_ids" nolabel="1" colspan="4"/>
</page>
</notebook>
</field>
</record>
</data>
</openerp>

8
addons/hr/hr_view.xml
View File

@ -30,11 +30,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Employee">
<group colspan="4" col="4">
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="user_id"/>
<field name="active"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="Personal Information">
@ -119,7 +119,7 @@
parent="menu_open_view_employee_list"/>-->
<record id="open_view_employee_list_my" model="ir.actions.act_window">
<field name="name">All Employees</field>
<field name="name">Employees</field>
<field name="res_model">hr.employee</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>

36
addons/hr_expense/hr_expense_view.xml
View File

@ -118,24 +118,40 @@
<field name="model">hr.expense.expense</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Expense">
<group col='6' colspan='4'>
<filter icon="gtk-execute" string="My Expense" domain="[('user_id','=',uid)]" separator="1" help="Expenses Related to Current User"/>
<field name="state" select="1">
<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Expense"/>
<filter icon="terp-hr" domain="[('state','=','accepted')]" help="Accepted Expense"/>
<filter icon="terp-hr" domain="[('state','=','invoiced')]" help="Invoiced Expense"/>
</field>
<search string="Expense">
<group col="20" colspan="4">
<filter
icon="terp-hr"
domain="[('state','=','draft')]"
string="Draft"
help="Draft Expense"/>
<filter
icon="terp-hr"
domain="[('state','=','confirm')]"
string="To Validate"
help="Confirmed Expense"/>
<filter
icon="terp-hr"
domain="[('state','=','accepted')]"
string="To Pay"
help="Expenses to Invoice"/>
<separator orientation="vertical"/>
<field name="name" select='1'/>
<field name="user_id" select="1" widget="selection"/>
<field name="user_id" select="1" widget="selection">
<filter
icon="gtk-execute"
help="My Expenses"
default="1"
domain="[('user_id','=',uid)]"/>
</field>
<field name="state" select="1"/>
</group>
</search>
</field>
</record>
<record id="expense_all" model="ir.actions.act_window">
<field name="name">All expenses</field>
<field name="name">Expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_hr_expense_filter"/>