[MERGE] forward port of branch 7.0 up to 680f955

diff --cc addons/account/account_move_line.py
Simple merge

diff --cc addons/crm/crm_phonecall.py
Simple merge

diff --cc addons/hr_payroll/hr_payroll.py
Simple merge

diff --cc addons/procurement/wizard/schedulers_all.py
Simple merge

diff --cc addons/project/project_view.xml
index f158309,04d5c0f..91b8071
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -381,10 -376,8 +381,10 @@@
                      </h1>
                      <group>
                          <group>
-                             <field name="project_id" domain="[('state', '!=', 'close')]" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
+                             <field name="project_id" domain="[('state','not in', ('close', 'cancelled'))]" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
 -                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": True}'/>
 +                            <field name="user_id"
 +                                options='{"no_open": True}'
 +                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}"/>
                              <field name="planned_hours" widget="float_time"
                                      groups="project.group_time_work_estimation_tasks"
                                      on_change="onchange_planned(planned_hours, effective_hours)"/>

diff --cc addons/sale/wizard/sale_make_invoice_advance.py
Simple merge

diff --cc openerp/addons/base/ir/ir_values.py
Simple merge