[MERGE]merge and resolve conflicts

bzr revid: sgo@tinyerp.com-20131029133347-b22zkm0hgg3y9an3

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

diff --cc addons/account/account_invoice_view.xml
index 364a6ad,3cf10f4..faa2aae
--- 1/addons/account/account_invoice_view.xml
--- 2/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@@ -250,7 -251,7 +251,7 @@@
                              <group>
                                  <group>
                                      <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                                     <field name="user_id" string="Responsible"/>
 -                                    <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
++                                    <field name="user_id" string="Responsible" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
                                      <field name="name" invisible="1"/>
                                      <field name="payment_term" widget="selection"/>
                                  </group>

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/account_voucher/account_voucher_view.xml
Simple merge

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