[MERGE] forward port of branch 8.0 up to 87dcaa9
authorChristophe Simonis <chs@odoo.com>
Wed, 5 Nov 2014 20:38:03 +0000 (21:38 +0100)
committerChristophe Simonis <chs@odoo.com>
Wed, 5 Nov 2014 20:38:03 +0000 (21:38 +0100)
1  2 
addons/project/project.py
addons/project/project_view.xml

Simple merge
@@@ -93,9 -94,9 +93,9 @@@
                          <h1>
                              <field name="name" string="Project Name"/>
                          </h1>
 -                        <div name="options_active">
 +                        <div name="options_active" invisible="1">
                              <field name="use_tasks" class="oe_inline"/>
-                             <label for="use_tasks" name="use_task"/>
 -                            <label for="use_tasks" string="Use Tasks"/>
++                            <label for="use_tasks" name="use_task" string="Use Tasks"/>
                          </div>
                      </div>
                      <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
                                      attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"
                                      context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
                              <newline/>
-                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/>
                          </group>
 -                            <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
 -                                To invoice or setup invoicing and renewal options, go to the related contract:
 -                                <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
 -                            </p>
                          <group name="group_alias"
                                  attrs="{'invisible': [('alias_domain', '=', False)]}">
                              <label for="alias_name" string="Email Alias"/>
                                  <field name="resource_calendar_id"
                                          groups="project.group_time_work_estimation_tasks"/>
                              </group>
 -                            <group string="Miscellaneous" name="misc">
 +                            <group name="misc">
-                                 <field name="date_start"/>
+                                 <field name="date_start" string="Start Date"/>
                                  <field name="date" string="End Date"/>
                                  <field name="sequence" groups="base.group_no_one"/>
                                  <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>