Merge with addons-trunk revno 7150

Adapt views accordingly

bzr revid: alexis@via.ecp.fr-20120802134012-fjk20wld5rv9v45i

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

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

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

diff --cc addons/account/partner_view.xml
index 8f4f4f6,1e360f6..0fc72f7
--- 1/addons/account/partner_view.xml
--- 2/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@@ -90,43 -89,44 +89,45 @@@
                              <field name="credit"/>
                              <field name="credit_limit"/>
                          </group>
-                         <group string="Supplier Debit" col="4">
+                         <group>
+                             <field name="property_account_payable" groups="account.group_account_invoice"/>
++                            <field name="property_supplier_payment_term" widget="selection"/>
                              <field name="debit"/>
                          </group>
-                         <field name="bank_ids">
-                             <form string="Bank account" version="7.0">
-                                 <field name="state"/>
-                                 <field name="acc_number"/>
-                                 <group>
-                                     <group name="owner" string="Bank Account Owner">
-                                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                         <field name="owner_name"/>
-                                         <label for="street" string="Address"/>
+                     </group>
+                     <field name="bank_ids">
+                         <form string="Bank account" version="7.0">
+                             <field name="state"/>
+                             <field name="acc_number"/>
+                             <group>
+                                 <group name="owner" string="Bank Account Owner">
+                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                     <field name="owner_name"/>
+                                     <label for="street" string="Address"/>
+                                     <div>
+                                         <field name="street" placeholder="Street..."/>
                                          <div>
-                                             <field name="street" placeholder="Street..."/>
-                                             <div>
-                                                 <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                                 <field name="city" class="oe_inline" placeholder="City"/>
-                                             </div>
-                                             <field name="state_id" placeholder="State"/>
-                                             <field name="country_id" placeholder="Country"/>
+                                             <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                             <field name="city" class="oe_inline" placeholder="City"/>
                                          </div>
-                                     </group>
-                                     <group name="bank" string="Information About the Bank">
-                                         <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                         <field name="bank_name"/>
-                                         <field name="bank_bic" placeholder="[Identifier code]"/>
-                                     </group>
+                                         <field name="state_id" placeholder="State"/>
+                                         <field name="country_id" placeholder="Country"/>
+                                     </div>
                                  </group>
-                             </form>
-                             <tree string="Bank Details">
-                                 <field name="sequence" invisible="1"/>
-                                 <field name="acc_number"/>
-                                 <field name="bank_name"/>
-                                 <field name="owner_name"/>
-                             </tree>
-                         </field>
-                     </group>
+                                 <group name="bank" string="Information About the Bank">
+                                     <field name="bank" on_change="onchange_bank_id(bank)"/>
+                                     <field name="bank_name"/>
+                                     <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
+                                 </group>
+                             </group>
+                         </form>
+                         <tree string="Bank Details">
+                             <field name="sequence" invisible="1"/>
+                             <field name="acc_number"/>
+                             <field name="bank_name"/>
+                             <field name="owner_name"/>
+                         </tree>
+                     </field>
                  </page>
                  </page>
              </field>

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

diff --cc addons/purchase/purchase_view.xml
index 5ee0f21,313df25..d966015
--- 1/addons/purchase/purchase_view.xml
--- 2/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@@ -238,18 -243,12 +243,13 @@@
                                      <field name="shipped" groups="base.group_no_one"/>
                                  </group>
                                  <group>
-                                     <field name="validator" groups="base.group_no_one"/>
-                                     <field name="date_approve"/>
-                                 </group>
-                             </group>
-                             <group string="Invoicing">
-                                 <group>
                                      <field name="invoice_method"/>
                                      <field name="invoiced"/>
-                                 </group>
-                                 <group>
 +                                    <field name="payment_term" widget="selection"/>
                                      <field name="fiscal_position"/>
+                                     <!-- We do not need these fields anymore, the information is in open chatter -->
+                                     <field name="validator" groups="base.group_no_one"/>
+                                     <field name="date_approve" groups="base.group_no_one"/>
                                  </group>
                              </group>
                              <separator string="Invoices"/>

diff --cc addons/purchase/stock.py
Simple merge

diff --cc addons/purchase/wizard/purchase_line_invoice.py
Simple merge

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