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

[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp-improvements-bde 

bzr revid: atp@tinyerp.com-20120628093335-nldod877foqztdck
This commit is contained in:
Atul Patel (OpenERP) 2012-06-28 15:03:35 +05:30
parent 0e77215c1b 86ef8d586c
commit dc6d5ee4ff
4 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/project_issue/project_issue_view.xml
View File

@ -112,8 +112,8 @@
<field name="active"/>
</group>
<group colspan="4" col="4">
<separator string="State" colspan="4"/>
<field name="state" groups="base.group_no_one"/>
<separator string="Status" colspan="4"/>
<field name="state" groups="base.group_no_one" string="Status"/>
</group>
</page>
</notebook>

3
addons/project_issue_sheet/project_issue_sheet_view.xml
View File

@ -11,9 +11,8 @@
<attribute name="on_change">on_change_project(project_id)</attribute>
</field>
<field name="active" position="after">
<separator string="Analytic Account" colspan="4"/>
<newline/>
<group colspan="4" col="4">
<group colspan="4">
<field name="analytic_account_id"
domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
on_change='on_change_account_id(analytic_account_id)'/>

4
addons/resource/resource.py
View File

@ -262,8 +262,8 @@ class resource_calendar_attendance(osv.osv):
'name' : fields.char("Name", size=64, required=True),
'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
'date_from' : fields.date('Starting Date'),
'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from", select=True),
'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
'hour_from' : fields.float('Work from', size=8, required=True, help="Start and End time of working.", select=True),
'hour_to' : fields.float("Work to", size=8, required=True),
'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
}

40
addons/resource/resource_view.xml
View File

@ -125,6 +125,7 @@
<field name="dayofweek"/>
<field name="hour_from" widget="float_time"/>
<field name="hour_to" widget="float_time"/>
<field name="date_from"/>
</tree>
</field>
</record>
@ -232,26 +233,31 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leave Detail" version="7.0">
<sheet>
<group>
<group>
<field name="resource_id" on_change="onchange_resource(resource_id)"/>
<field name="name" string="Reason"/>
<label for="date_from" string="Duration"/>
<div>
<field name="date_from" nolabel="1"/> -
<field name="date_to" nolabel="1"/>
</div>
</group>
<group>
<field name="calendar_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
</sheet>
<sheet>
<group>
<group>
<field name="resource_id" on_change="onchange_resource(resource_id)"/>
<field name="name" string="Reason"/>
</group>
<group>
<field name="calendar_id" string="Working Period"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
<group>
<group>
<label for="date_from" string="Duration"/>
<div>
<field name="date_from" class="oe_inline"/>-
<field name="date_to" class="oe_inline"/>
</div>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="resource_calendar_leave_tree" model="ir.ui.view">
<field name="name">resource.calendar.leaves.tree</field>
<field name="model">resource.calendar.leaves</field>