[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20140210052655-efiwytz5kllk7irx

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

diff --cc addons/account/account_view.xml
index 7d350fd,1ebf75a..7cbf0b2
--- 1/addons/account/account_view.xml
--- 2/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@@ -2261,8 -2263,7 +2261,7 @@@
                      <group>
                          <group>
                              <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
 -                            <field name="user_id" readonly="1" string="Responsible"/>
 +                            <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}" string="Responsible"/>
-                             <field name="total_entry_encoding"/>
                              <field name='company_id' widget="selection" groups="base.group_multi_company" />
                          </group>
                          <group>

diff --cc addons/account_analytic_plans/account_analytic_plans_view.xml
Simple merge

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

diff --cc addons/project/project_data.xml
Simple merge