From 81fd7b194641d002a80bbec409a001a511958000 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 16:13:10 +0530
Subject: [IMP/ADD]create analytic view in analytic and made changes as per
 needed and improve code and made onchange for partner

bzr revid: sgo@tinyerp.com-20120528104310-oquklh2l63fq3muk
---
 addons/analytic/analytic_view.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 addons/analytic/analytic_view.xml

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
new file mode 100644
index 00000000000..cc9f351074d
--- /dev/null
+++ b/addons/analytic/analytic_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">analytic.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form  layout="manual">
+                    <sheet string="Analytic account" layout="auto">
+                        <group colspan="4" col="4" class="oe_form_group_label_border">
+                            <field name="name" string="Contract/Project Name"/>
+                            <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
+                            <field name="code"/>
+                            <field name="user_id"/>
+                            <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
+                            <field name="type" select="2"/>
+                            <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Contract Information" name="contract_page">
+                                <group colspan="2" col="2" name="contract" class="oe_form_group_label_border">
+                                    <separator colspan="2" string="Validity"/>
+                                    <field name="date_start"/>
+                                    <field name="date"/>
+                                </group>
+                                <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
+                                    <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+     </data>
+</openerp>
-- 
cgit v1.2.3


From 250702de4c45f2a1364c5eaf69e2404bf990232c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 28 May 2012 16:48:30 +0530
Subject: [IMP]:improved on_change code and add Terma and Condition in analytic
 view.

bzr revid: apa@tinyerp.com-20120528111830-znaex5pikedc3sn7
---
 addons/analytic/analytic_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index cc9f351074d..b005d364364 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,6 +28,8 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
+                                <separator string="Terms and Condition" colspan="4"/>
+                                <field colspan="4" name="description" nolabel="1"/>
                             </page>
                         </notebook>
                     </sheet>
-- 
cgit v1.2.3


From cc38db164db0b29866b401083b1d0a049c9003a3 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 29 May 2012 11:16:21 +0530
Subject: [IMP]:improved view for contract

bzr revid: apa@tinyerp.com-20120529054621-7eaa6o1meg8xwvk1
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index b005d364364..0b909d2c5c0 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,7 +28,7 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
-                                <separator string="Terms and Condition" colspan="4"/>
+                                <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
                         </notebook>
-- 
cgit v1.2.3


From 41161a904c7c7ecb6872759d8c979e8a8a466c66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 16:01:59 +0530
Subject: [IMP]analytic: Add members field

bzr revid: dbr@tinyerp.com-20120530103159-n9yw01h99ap56yfw
---
 addons/analytic/analytic_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0b909d2c5c0..55a64168767 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,6 +28,8 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
+                                <separator string="Team" colspan="4" name="team"/>
+                                <field colspan="4" name="members" nolabel="1"/>
                                 <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
-- 
cgit v1.2.3


From 3b7f1698d9856eba10e46acacd5ab8bb7e0237e7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 18:09:13 +0530
Subject: [IMP]project: Set members field in proper module

bzr revid: dbr@tinyerp.com-20120530123913-e7u4m3m3u6lgiop6
---
 addons/analytic/analytic_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 55a64168767..af5925829dd 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -20,7 +20,7 @@
                         </group>
                         <notebook colspan="4">
                             <page string="Contract Information" name="contract_page">
-                                <group colspan="2" col="2" name="contract" class="oe_form_group_label_border">
+                                <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Validity"/>
                                     <field name="date_start"/>
                                     <field name="date"/>
@@ -28,8 +28,6 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
-                                <separator string="Team" colspan="4" name="team"/>
-                                <field colspan="4" name="members" nolabel="1"/>
                                 <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
-- 
cgit v1.2.3


From e7f5c1088bbdcaee6a48fe534ec7501ff858c3d5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 4 Jun 2012 16:03:42 +0530
Subject: [IMP]type invible when type is contract and template and project
 related issues solved

bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index af5925829dd..4ef37e88b9b 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -15,7 +15,7 @@
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type" select="2"/>
+                            <field name="type" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
-- 
cgit v1.2.3


From 48cf6955a736b9ba2ccc486e5bc2a29bf1229639 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 6 Jun 2012 12:36:51 +0530
Subject: [IMP]improve view and add field in hr_timesheet_invoice

bzr revid: sgo@tinyerp.com-20120606070651-ol42dl8d6o5lqlsl
---
 addons/analytic/analytic_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 4ef37e88b9b..197a7db8d8a 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,6 +28,7 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
+                                <group name="toinvoice" invisible="1"></group>
                                 <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
-- 
cgit v1.2.3


From 0125e320c98705ec412daf0d154ca84466262687 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Jun 2012 17:36:29 +0200
Subject: [IMP] analytic: misc imp related to project and contract mangement
 task

bzr revid: qdp-launchpad@openerp.com-20120606153629-jlk1k0ze09b7pu6s
---
 addons/analytic/analytic_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 197a7db8d8a..e83a2485e0b 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -19,7 +19,7 @@
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
-                            <page string="Contract Information" name="contract_page">
+                            <page string="Contract Information" name="contract_page" col="4">
                                 <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Validity"/>
                                     <field name="date_start"/>
@@ -28,8 +28,8 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
-                                <group name="toinvoice" invisible="1"></group>
-                                <separator string="Terms and Condition" colspan="4" name="description"/>
+                                <group name="toinvoice" colspan="4" col="4"></group>
+                                <separator string="Terms and Conditions" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
                         </notebook>
-- 
cgit v1.2.3


From 861f6ce70eb7bfdd596c89a7afc47f1d5bea1269 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:24:36 +0530
Subject: [IMP]analytic: Improve on_change_partner_id.

bzr revid: dbr@tinyerp.com-20120607055436-ipyx4dku1suhxd21
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index e83a2485e0b..c8576f564b6 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -11,7 +11,7 @@
                     <sheet string="Analytic account" layout="auto">
                         <group colspan="4" col="4" class="oe_form_group_label_border">
                             <field name="name" string="Contract/Project Name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
+                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" required="True"/>
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-- 
cgit v1.2.3


From a36b500424f923ee2638b237b79002a1db141a76 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 11:28:47 +0530
Subject: [IMP]:analytic,project:the validity and project sections are on the
 same line.

bzr revid: apa@tinyerp.com-20120607055847-12hq1p2fnalr0xs8
---
 addons/analytic/analytic_view.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index e83a2485e0b..c6b653698d7 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -20,13 +20,15 @@
                         </group>
                         <notebook colspan="4">
                             <page string="Contract Information" name="contract_page" col="4">
-                                <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
-                                    <separator colspan="2" string="Validity"/>
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                </group>
-                                <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
-                                    <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
+                                <group col="4" colspan="4">
+                                    <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
+                                        <separator colspan="2" string="Validity"/>
+                                        <field name="date_start"/>
+                                        <field name="date"/>
+                                    </group>
+                                    <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
+                                        <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
+                                    </group>
                                 </group>
                                 <group name="toinvoice" colspan="4" col="4"></group>
                                 <separator string="Terms and Conditions" colspan="4" name="description"/>
-- 
cgit v1.2.3


From b619fa8c01f6c4dcbe46caf3627181cae27a992e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:34:07 +0530
Subject: [IMP]analytic: Remove attrs from type field

bzr revid: dbr@tinyerp.com-20120607060407-97iu7kh4zq0gnno5
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index c8576f564b6..3763d2c880d 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -15,7 +15,7 @@
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                            <field name="type" select="2"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
-- 
cgit v1.2.3


From 8cb3df4d4250b362da8919d0f25126b2dfb70174 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 14:39:33 +0530
Subject: [IMP]analytic: Customer field should not be required on Template of
 Contract form

bzr revid: dbr@tinyerp.com-20120607090933-b2bxd8dwa7i5ythd
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 3763d2c880d..f661b8bd08c 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -11,7 +11,7 @@
                     <sheet string="Analytic account" layout="auto">
                         <group colspan="4" col="4" class="oe_form_group_label_border">
                             <field name="name" string="Contract/Project Name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" required="True"/>
+                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-- 
cgit v1.2.3


From 235aa515c549885fa509df9fda81b55c7b5d1e88 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 7 Jun 2012 11:31:59 +0200
Subject: [IMP] analytic: added chatter widget on analytic accounts

bzr revid: qdp-launchpad@openerp.com-20120607093159-32qmv70xghw8lbim
---
 addons/analytic/analytic_view.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 376b1eb733b..95ebb84ed28 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -36,6 +36,9 @@
                             </page>
                         </notebook>
                     </sheet>
+                    <div class="oe_form_bottom">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 7be4e97126a909c4568eea913f3907cfee6df12f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 15:44:00 +0530
Subject: [IMP]analytic: Improve form view name lable

bzr revid: dbr@tinyerp.com-20120607101400-rlva9kihbbtucqmv
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index f661b8bd08c..2cb28b30855 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -10,7 +10,7 @@
                 <form  layout="manual">
                     <sheet string="Analytic account" layout="auto">
                         <group colspan="4" col="4" class="oe_form_group_label_border">
-                            <field name="name" string="Contract/Project Name"/>
+                            <field name="name"/>
                             <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
                             <field name="code"/>
                             <field name="user_id"/>
-- 
cgit v1.2.3


From 15b9557943168342022dbc7002fac4ec2b98e0de Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 15:53:51 +0530
Subject: [IMP]:improved contract view in project module

bzr revid: apa@tinyerp.com-20120607102351-8mqh6e93ecjqxb8f
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 95ebb84ed28..fcac70f228e 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -13,7 +13,7 @@
                             <field name="name" string="Contract/Project Name"/>
                             <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" required="True"/>
                             <field name="code"/>
-                            <field name="user_id"/>
+                            <field name="manager_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             <field name="type" select="2"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
-- 
cgit v1.2.3


From 56ffb32517c4041ddc46b4762aac83687c3591c2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 14 Jun 2012 15:37:53 +0530
Subject: [IMP]:contract,analytic_project,analytic_hr_expense: improve whole
 contract view use group instead of table and improve view

bzr revid: sgo@tinyerp.com-20120614100753-giewe8jay1xx04wb
---
 addons/analytic/analytic_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index c63d3bd7722..a606209a5ee 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -15,11 +15,11 @@
                             <field name="code"/>
                             <field name="manager_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type" select="2"/>
+                            <field name="type"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
-                            <page string="Contract Information" name="contract_page" col="4">
+                            <page string="Contract Information" name="contract_page">
                                 <group col="4" colspan="4">
                                     <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
                                         <separator colspan="2" string="Validity"/>
@@ -29,8 +29,8 @@
                                     <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                         <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                     </group>
+                                     <group name="toinvoice" colspan="4" col="4"></group>
                                 </group>
-                                <group name="toinvoice" colspan="4" col="4"></group>
                                 <separator string="Terms and Conditions" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
-- 
cgit v1.2.3


From 66c3093feef8df9c21f34fa1aea402087dd3c7ea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:12:54 +0200
Subject: [IMP] contract management: misc improvements

bzr revid: qdp-launchpad@openerp.com-20120615081254-rhh9nwmz3bqn7e9d
---
 addons/analytic/analytic_view.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index f82be212af9..3f37d5ec246 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -19,17 +19,16 @@
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
-                            <page string="Contract Information" name="contract_page">
-                                <group col="4" colspan="4">
-                                    <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
-                                        <separator colspan="2" string="Validity"/>
+                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','=','view')]}">
+                                <group>
+                                    <group string="Validity" name="contract">
                                         <field name="date_start"/>
                                         <field name="date"/>
                                     </group>
-                                    <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
-                                        <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
+                                    <group name="project">
+                                        <separator colspan="2" string="Project Management" name="project_sep" invisible="1"/>
                                     </group>
-                                     <group class="oe_form_group_label_border" name="toinvoice" colspan="4" col="4"></group>
+                                     <group name="toinvoice"></group>
                                 </group>
                                 <separator string="Terms and Conditions" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
-- 
cgit v1.2.3


From df29917965e635db681b9f20ddcb529d15ca1cc8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Jun 2012 10:44:24 +0200
Subject: [IMP] change

bzr revid: fp@tinyerp.com-20120615084424-fkbi7gg98erdf8fg
---
 addons/analytic/analytic_view.xml | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 3f37d5ec246..7f81717109d 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -8,19 +8,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <sheet string="Analytic account" >
-                        <group colspan="4" col="4" class="oe_form_group_label_border">
+                    <sheet string="Analytic Account">
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1>
                             <field name="name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
-                            <field name="code"/>
-                            <field name="manager_id"/>
-                            <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="code"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="type"/>
+                            </group>
+                            <group>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
+                                <field name="manager_id"/>
+                                <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
+                            </group>
                         </group>
-                        <notebook colspan="4">
+                        <notebook>
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','=','view')]}">
-                                <group>
+                                <group name="master">
                                     <group string="Validity" name="contract">
                                         <field name="date_start"/>
                                         <field name="date"/>
@@ -28,16 +35,15 @@
                                     <group name="project">
                                         <separator colspan="2" string="Project Management" name="project_sep" invisible="1"/>
                                     </group>
-                                     <group name="toinvoice"></group>
                                 </group>
-                                <separator string="Terms and Conditions" colspan="4" name="description"/>
-                                <field colspan="4" name="description" nolabel="1"/>
+                                <separator string="Terms and Conditions" name="description"/>
+                                <field name="description"/>
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_form_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From ff519229291957074cc7875a8eb96c8822dbe9c1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 17:19:19 +0200
Subject: [IMP] usability imp

bzr revid: qdp-launchpad@openerp.com-20120615151919-a1yisdlk672ehqft
---
 addons/analytic/analytic_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 7f81717109d..b32ab05d907 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -22,7 +22,7 @@
                             <group>
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
                                 <field name="manager_id"/>
-                                <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
+                                <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>
                         <notebook>
@@ -33,7 +33,7 @@
                                         <field name="date"/>
                                     </group>
                                     <group name="project">
-                                        <separator colspan="2" string="Project Management" name="project_sep" invisible="1"/>
+                                        <separator string="Project Management" name="project_sep" invisible="1"/>
                                     </group>
                                 </group>
                                 <separator string="Terms and Conditions" name="description"/>
-- 
cgit v1.2.3


From 015f03776e03384cfa6fe477ef51ef26896a4178 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 19 Jun 2012 14:21:28 +0200
Subject: [IMP] contract management: improved usability, mostly in
 account.analytic.account form view

bzr revid: qdp-launchpad@openerp.com-20120619122128-axj9zn61ahalgg98
---
 addons/analytic/analytic_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index b32ab05d907..d094b6059c0 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -15,18 +15,18 @@
                         </h1>
                         <group>
                             <group>
-                                <field name="code"/>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
                                 <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                                 <field name="type"/>
                             </group>
                             <group>
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
+                                <field name="code"/>
                                 <field name="manager_id"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>
                         <notebook>
-                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','=','view')]}">
+                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
                                 <group name="master">
                                     <group string="Validity" name="contract">
                                         <field name="date_start"/>
-- 
cgit v1.2.3


From 4c2541d7a363a372cf7c08e5c3bc14da8a7fc8f5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 11:32:29 +0530
Subject: [IMP]change name over 3 module and improve view

bzr revid: sgo@tinyerp.com-20120622060229-o0al0w0jxz19fd9k
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index d094b6059c0..f19eaf114f4 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <sheet string="Analytic Account">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name"/>
                         </h1>
-- 
cgit v1.2.3


From 95cd61d1f560885bf3161ed49c9779e172fe8643 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 14:40:08 +0530
Subject: [IMP]improve view of contract and open chatter notification added
 when state changed

bzr revid: sgo@tinyerp.com-20120622091008-uy805uph0hz4vk0h
---
 addons/analytic/analytic_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index f19eaf114f4..4fa01a92204 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -29,8 +29,10 @@
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
                                 <group name="master">
                                     <group string="Validity" name="contract">
-                                        <field name="date_start"/>
-                                        <field name="date"/>
+                                        <label string="Duration"/>
+                                        <div name="duration">
+                                            <field name="date_start"/> - <field name="date"/>
+                                        </div>
                                     </group>
                                     <group name="project">
                                         <separator string="Project Management" name="project_sep" invisible="1"/>
-- 
cgit v1.2.3


From ea842f4554b41c7f8cadf250480ba364c25f7927 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 25 Jun 2012 17:55:40 +0200
Subject: [REF] code review

bzr revid: qdp-launchpad@openerp.com-20120625155540-n0e5lm0rhytsk22t
---
 addons/analytic/analytic_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 4fa01a92204..1ff623eff5c 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -29,9 +29,9 @@
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
                                 <group name="master">
                                     <group string="Validity" name="contract">
-                                        <label string="Duration"/>
+                                        <label for="date_start" string="Duration"/>
                                         <div name="duration">
-                                            <field name="date_start"/> - <field name="date"/>
+                                            <field name="date_start" class="oe_form_inline"/> - <field name="date" class="oe_form_inline"/>
                                         </div>
                                     </group>
                                     <group name="project">
-- 
cgit v1.2.3


From 266dbe297231d6b1bf1de9449bfdb3a5f116170d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 26 Jun 2012 13:02:35 +0200
Subject: [IMP] contract management: oe_form_inline -> oe_inline

bzr revid: qdp-launchpad@openerp.com-20120626110235-et4y4m25k8u3fex4
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic/analytic_view.xml')

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 1ff623eff5c..85a1520e561 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -31,7 +31,7 @@
                                     <group string="Validity" name="contract">
                                         <label for="date_start" string="Duration"/>
                                         <div name="duration">
-                                            <field name="date_start" class="oe_form_inline"/> - <field name="date" class="oe_form_inline"/>
+                                            <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
                                         </div>
                                     </group>
                                     <group name="project">
-- 
cgit v1.2.3