merge

bzr revid: fp@tinyerp.com-20100829205857-285ehurjvns9s7w1

diff --cc addons/account_voucher/voucher_payment_receipt_view.xml
index 8044093,85e39b4..4ffba53
--- 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
@@@ -81,9 -105,9 +105,10 @@@
                          <field name="journal_id"
                              domain="[('type','in',['bank', 'cash'])]"
                              widget="selection" select="1"
--                            on_change="onchange_partner_id(partner_id, journal_id, amount)"
++                            on_change="onchange_partner_id(partner_id, journal_id, amount, type)"
                              string="Payment Method"/>
-                         <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
 -                        <field name="amount"/>
++                        <field name="amount"
++                            on_change="onchange_partner_id(partner_id, journal_id, amount, type)"/>
                          <field name="reference" select="1" string="Payment Ref"/>
                          <field name="name" colspan="4"/>
                          <field name="account_id"

diff --cc addons/account_voucher/voucher_sales_purchase_view.xml
index 09ff786,523f72e..4ff3bdc
--- 1/addons/account_voucher/voucher_sales_purchase_view.xml
--- 2/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@@ -89,11 -90,13 +90,13 @@@
              <field name="arch" type="xml">
                  <form string="Vendor Bills">
                      <group col="6" colspan="4">
-                         <field name="partner_id" on_change="onchange_partner_id(partner_id, type, journal_id)"/>
+                         <field name="partner_id" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
+                         <field name="journal_id" domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id)"/>
 -                        <field name="number"/>
 -                        <field name="name" colspan="4"/>
+                         <field name="reference" select="1"/>
 +                        <field name="name" colspan="4"/>
-                         <field name="journal_id"  domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
-                         <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
 +                        <field name="number"/>
+                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
+                         <field name="type" invisible="True"/>
                      </group>
                      <notebook colspan="4">
                          <page string="Bill Information">