From 7a41e200186a806be121c67b01e3ecf66ee94c64 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 29 Aug 2008 01:33:53 +0200
Subject: [PATCH] Modifs

bzr revid: fp@tinyerp.com-20080828233353-v3a1rqrvgrp7je9d
---
 addons/account/account_invoice_view.xml | 20 +++++++++----------
 addons/account/account_view.xml         | 26 +++++++++++++------------
 addons/account/project/project_view.xml | 14 +++++++------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index abf88954672..f9a8151bf2e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -112,12 +112,12 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
-                    <notebook>
+                    <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
+                    <field name="type" readonly="1" select="2"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)" select="1"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
-                            <field name="type" readonly="1" select="2"/>
-                            <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
                             <field name="date_due" select="1"/>
                             <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
@@ -196,12 +196,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice">
-                    <notebook>
+                    <field name="journal_id" select="2"/>
+                    <field name="type" readonly="1" select="2"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <notebook colspan="4">
                         <page string="Invoice">
-                            <field name="journal_id" select="2"/>
-                            <field name="type" readonly="1" select="2"/>
-                            <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
                             <field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
                             <field name="name" select="2"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2505a6f7693..3bc5fa992ef 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -242,12 +242,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal">
-                    <notebook>
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="type"/>
+                    <notebook colspan="4">
                         <page string="General Information">
-                            <field name="name" select="1"/>
-                            <field name="active" select="1"/>
-                            <field name="code" select="1"/>
-                            <field name="type"/>
                             <field name="view_id"/>
                             <field name="sequence_id"/>
                             <field name="default_debit_account_id"/>
@@ -554,14 +554,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax">
-                    <notebook>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="company_id"/>
+                        <field name="description" select="1"/>
+                        <field name="active" select="2"/>
+                        <field name="tax_group" select="1"/>
+                        <field name="type"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Tax Definition">
-                            <field name="name" select="1"/>
-                            <field name="company_id"/>
-                            <field name="description" select="1"/>
-                            <field name="tax_group" select="1"/>
-                            <field name="active" select="2"/>
-                            <field name="type"/>
                             <field name="applicable_type"/>
                             <field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 78fb0465f62..d338bc06c29 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -44,12 +44,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic account">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                    <field name="company_id" select="2"/>
-                    <field name="type" select="2"/>
-                    <field name="partner_id" select="1"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="parent_id" on_change="on_change_parent(parent_id)"/>
+                        <field name="company_id" select="2"/>
+                        <field name="type" select="2"/>
+                        <field name="partner_id" select="1"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Account Data">
                             <field name="date_start"/>