[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121108123206-7g866idcg3s58df2

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

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

diff --cc addons/account_voucher/__openerp__.py
index 85090cd,927fda1..77a7672
--- 1/addons/account_voucher/__openerp__.py
--- 2/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@@ -60,10 -60,8 +60,11 @@@ This module manages
          'security/account_voucher_security.xml',
          'account_voucher_data.xml',
      ],
 +    'js': [
 +        'static/src/js/account_voucher.js',
 +    ],
      'test' : [
+         'test/case5_suppl_usd_usd.yml',
          'test/account_voucher.yml',
          'test/sales_receipt.yml',
          'test/sales_payment.yml',

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

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

diff --cc addons/account_voucher/voucher_payment_receipt_view.xml
index a671fe2,881a5e3..100c657
--- 1/addons/account_voucher/voucher_payment_receipt_view.xml
--- 2/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@@ -509,9 -511,9 +509,10 @@@
                          </page>
                      </notebook>
                      </sheet>
 +                    <div class="oe_chatter" invisible="context.get('line_type', False)">
-                         <field name="message_ids" widget="mail_thread"/>
+                     <div class="oe_chatter">
                          <field name="message_follower_ids" widget="mail_followers"/>
+                         <field name="message_ids" widget="mail_thread"/>
                      </div>
                  </form>
              </field>