Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp-improvements-bde
into lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-view-imp-atp-improvements-bde/+merge/112513
Hello Sir,
I have improved some views of project module after review.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-view-imp-atp-improvements-bde/+merge/112513
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp-improvements-bde
into lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp.
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-06-26 06:20:15 +0000
+++ project_issue/project_issue_view.xml 2012-06-28 08:52:18 +0000
@@ -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>
=== modified file 'project_issue_sheet/project_issue_sheet_view.xml'
--- project_issue_sheet/project_issue_sheet_view.xml 2012-06-22 11:46:01 +0000
+++ project_issue_sheet/project_issue_sheet_view.xml 2012-06-28 08:52:18 +0000
@@ -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)'/>
=== modified file 'resource/resource.py'
--- resource/resource.py 2012-04-24 06:05:32 +0000
+++ resource/resource.py 2012-06-28 08:52:18 +0000
@@ -262,8 +262,8 @@
'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),
}
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2012-06-27 13:06:32 +0000
+++ resource/resource_view.xml 2012-06-28 08:52:18 +0000
@@ -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>
@@ -139,7 +140,7 @@
<field name="name"/>
<field name="date_from"/>
<field name="dayofweek"/>
- <label for="hour_from" string="Hours"/>
+ <label for="hour_from" string="Hours" help="Start and End time of working"/>
<div>
<field name="hour_from" widget="float_time" class="oe_inline"/> -
<field name="hour_to" widget="float_time" class="oe_inline"/>
@@ -232,26 +233,29 @@
<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 col="2" colspan="4">
+ <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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
