From 34363fa5a75ce4c4ae706750c7cf9a74fac96629 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Wed, 25 Apr 2007 06:26:44 +0000
Subject: [PATCH] ALL: fix colspan 3->4 to improve behavior of the client
 interface 	command to run: 	find . -name "*.xml" -exec sed -i -e
 's/colspan="3"/colspan="4"/' {} \;

bzr revid: ced-c1ce001eb7b29c33f3cb47576d0884eb3020809f
---
 addons/account/account_invoice_view.xml       | 14 +++----
 addons/account/account_view.xml               | 40 +++++++++----------
 addons/account/project/project_view.xml       |  4 +-
 .../account_cash_discount_view.xml            |  2 +-
 addons/airport/custom_view.xml                |  4 +-
 addons/audittrail/audittrail_view.xml         |  4 +-
 addons/board/board_view.xml                   |  2 +-
 addons/board_sale/board_sale_view.xml         | 10 ++---
 addons/crm/crm_view.xml                       | 34 ++++++++--------
 addons/delivery/delivery_view.xml             |  6 +--
 addons/esale_ez/esale_view.xml                | 18 ++++-----
 addons/esale_joomla/esale_joomla_view.xml     | 10 ++---
 addons/esale_osc/esale_osc_view.xml           |  2 +-
 addons/hr/hr_view.xml                         | 16 ++++----
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 .../hr_contract_available_view.xml            |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  4 +-
 addons/hr_skill/hr_skill_view.xml             | 16 ++++----
 addons/hr_skill/old-hr_skill_view.xml         | 12 +++---
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 +-
 addons/l10n_ch/dta/dta_view.xml               |  4 +-
 addons/letter/letter_view.xml                 | 18 ++++-----
 addons/marketing/campaign/campaign_view.xml   | 20 +++++-----
 addons/mrp/mrp_view.xml                       | 34 ++++++++--------
 addons/network/network_view.xml               | 28 ++++++-------
 addons/product/pricelist_view.xml             |  8 ++--
 addons/product/product_view.xml               |  6 +--
 addons/project/project_view.xml               |  8 ++--
 addons/purchase/purchase_view.xml             | 12 +++---
 addons/sale/sale_view.xml                     | 18 ++++-----
 addons/sale_journal/sale_journal_view.xml     |  2 +-
 addons/sandwich/sandwich_view.xml             |  4 +-
 addons/scrum/scrum_view.xml                   |  6 +--
 addons/stock/stock_view.xml                   | 20 +++++-----
 addons/subscription/subscription_view.xml     |  8 ++--
 35 files changed, 200 insertions(+), 200 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 00ad2eec3f9..3711def7039 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -42,7 +42,7 @@
 			<form string="Invoice Line">
 				<notebook>
 					<page string="Line">
-						<field name="name" select="1" colspan="3"/>
+						<field name="name" select="1" colspan="4"/>
 						<field name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)" domain="[('company_id', '=', parent.company_id),('journal_id','=',parent.journal_id)]"/>
 						<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" />
 						<newline/>
@@ -53,7 +53,7 @@
 						<field name="discount"/>
 						<newline/>
 						<field name="price_subtotal"/>
-						<field name="invoice_line_tax_id" colspan="3"/> 
+						<field name="invoice_line_tax_id" colspan="4"/> 
 					</page>
 					<page string="Other">
 						<field name="note" colspan="4"/>
@@ -170,7 +170,7 @@
 						<field name="amount_tax"/>
 						<field name="amount_total"/>
 						<button name="button_compute" string="Compute taxes" states="draft" type="object" colspan="2"/>
-						<field name="state" select="1" colspan="3"/>
+						<field name="state" select="1" colspan="4"/>
 						<newline/>
 						<group col="3" colspan="4">
 							<button name="invoice_open" states="draft,proforma" string="Create"/>
@@ -186,14 +186,14 @@
 					<field name="payment_term" on_change="onchange_payment_term(payment_term)" />
 					<field name="reference" select="1"/>
 					<field name="origin"/>
-					<field name="address_contact_id" domain="[('partner_id','=',partner_id)]" colspan="3"/>
+					<field name="address_contact_id" domain="[('partner_id','=',partner_id)]" colspan="4"/>
 					<field name="partner_ref"/>
 					<field name="partner_contact"/>
 					<field name="move_id"/>
 					<field name="date_invoice" select="1"/>
 					<field name="period_id"/><label string="(keep empty to use the current period)" align="0.0" colspan="2"/>
 					<newline/>
-					<field name="comment" colspan="3"/>
+					<field name="comment" colspan="4"/>
 				</page>
 			</notebook>
 			</form>
@@ -251,14 +251,14 @@
 					<newline/>
 					<field name="reference" select="1"/>
 					<field name="origin"/>
-					<field name="address_contact_id" domain="[('partner_id','=',partner_id)]" colspan="3"/>
+					<field name="address_contact_id" domain="[('partner_id','=',partner_id)]" colspan="4"/>
 					<field name="partner_ref"/>
 					<field name="partner_contact"/>
 					<field name="move_id"/>
 					<field name="date_invoice" select="1"/>
 					<field name="period_id"/><label string="(keep empty to use the current period)" align="0.0" colspan="2"/>
 					<newline/>
-					<field name="comment" colspan="3"/>
+					<field name="comment" colspan="4"/>
 				</page>
 			</notebook>
 			</form>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5ec2377ada0..c40bb903e80 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -19,7 +19,7 @@
 				<field name="date_start"/>
 				<field name="date_stop"/>
 				<separator string="Periods" colspan="4"/>
-				<field name="period_ids" colspan="3" widget="one2many_list">
+				<field name="period_ids" colspan="4" widget="one2many_list">
 					<form string="Period">
 						<field name="name" select="1"/>
 						<field name="code" select="1"/>
@@ -111,7 +111,7 @@
 			<form string="Account Form">
 				<notebook>
 				<page string="General Information">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="company_id" select="1"/>
 					<newline/>
 					<field name="type" select="1"/>
@@ -124,8 +124,8 @@
 					<field name="reconcile"/>
 					<field name="active" select="1" />
 					<newline/>
-					<field name="parent_id" colspan="3"/>
-					<field name="tax_ids" colspan="3"/>
+					<field name="parent_id" colspan="4"/>
+					<field name="tax_ids" colspan="4"/>
 				</page><page string="Notes">
 					<field name="note" colspan="4" nolabel="1"/>
 				</page>
@@ -200,7 +200,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Journal Column">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="field" select="1"/>
 				<field name="sequence"/>
 				<newline/>
@@ -229,8 +229,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Journal View">
-				<field name="name" colspan="3" select="1"/>
-				<field name="columns_id" colspan="3" widget="one2many_list"/>
+				<field name="name" colspan="4" select="1"/>
+				<field name="columns_id" colspan="4" widget="one2many_list"/>
 			</form>
 		</field>
 	</record>
@@ -323,11 +323,11 @@
 				<page string="General">
 					<field name="name" select="1"/>
 					<field name="code" select="1"/>
-					<field name="partner_id" colspan="3"/>
+					<field name="partner_id" colspan="4"/>
 					<newline/>
-					<field name="bank_account_ids" colspan="3">
+					<field name="bank_account_ids" colspan="4">
 						<form string="Bank">
-							<field name="name" colspan="3" select="1"/>
+							<field name="name" colspan="4" select="1"/>
 							<field name="code" select="1"/>
 							<field name="currency_id"/>
 							<field name="iban"/>
@@ -358,7 +358,7 @@
 		<field name="priority" eval="8"/>
 		<field name="arch" type="xml">
 			<form string="Bank">
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="bank_id" select="1"/>
 				<field name="code" select="1"/>
 				<field name="iban"/>
@@ -549,7 +549,7 @@
 			<form string="Account Entry Reconcile">
 				<field name="name" select="1"/>
 				<field name="type" select="1"/>
-				<field name="line_id" colspan="3"/>
+				<field name="line_id" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -585,7 +585,7 @@
 				<field name="sum"/>
 				<field name="sum_period"/>
 				<newline/>
-				<field name="info" colspan="3"/>
+				<field name="info" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -648,7 +648,7 @@
 				<field name="child_depend"/>
 				<field name="sequence" />
 				<newline/>
-				<field name="child_ids" colspan="3"/>
+				<field name="child_ids" colspan="4"/>
 				</page><page string="Tax Declaration">
 					<separator colspan="4" string="Invoices"/>
 					<field name="base_code_id"/>
@@ -875,7 +875,7 @@
 				<field name="journal_id" select="1"/>
 
 				<separator string="Entry Lines" colspan="4"/>
-				<field name="line_id" colspan="3" widget="one2many_list" readonly="1">
+				<field name="line_id" colspan="4" widget="one2many_list" readonly="1">
 					<form string="Account Entry Line">
 						<separator string="General Information" colspan="4"/>
 						<field name="name" select="1"/>
@@ -1095,7 +1095,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Entry Model Line">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="sequence"/>
 				<field name="ref" select="1"/>
 				<field name="account_id"/>
@@ -1119,7 +1119,7 @@
 				<field name="name" select="1"/>
 				<field name="ref" select="1"/>
 				<field name="journal_id" select="1"/>
-				<field name="lines_id" colspan="3" widget="one2many_list"/>
+				<field name="lines_id" colspan="4" widget="one2many_list"/>
 				<group col="1" colspan="4">
 					<button name="generate" string="Generate Entries" type="object"/>
 				</group>
@@ -1193,9 +1193,9 @@
 				<field name="name" select="1"/>
 				<field name="active" select="1"/>
 				<separator string="Description on invoices" colspan="4"/>
-				<field name="note" colspan="3"/>
+				<field name="note" colspan="4"/>
 				<separator string="Computation" colspan="4"/>
-				<field name="line_ids" colspan="3"/>
+				<field name="line_ids" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -1269,7 +1269,7 @@
 					<button string="Remove Lines" name="remove_line" type="object" states="running"/>
 				</group>
 				<separator string="Subscription Lines" colspan="4"/>
-				<field name="lines_id" colspan="3" widget="one2many_list"/>
+				<field name="lines_id" colspan="4" widget="one2many_list"/>
 
 				<separator string="State" colspan="4"/>
 				<field name="state" select="1"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 39c159fbf8f..2517ebf630d 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -102,7 +102,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Analytic Entry">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="amount"  select="1"/>
 					<field name="date" select="1"/>
 					<field name="account_id" select="1"/>
@@ -173,7 +173,7 @@
 					<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" />
 					<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" />
 					<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" />
-					<field name="amount" colspan="3" />
+					<field name="amount" colspan="4" />
 				</form>
 			</field>
 		</record>
diff --git a/addons/account_cash_discount/account_cash_discount_view.xml b/addons/account_cash_discount/account_cash_discount_view.xml
index aa8dc074cf7..bb029d0bb2f 100644
--- a/addons/account_cash_discount/account_cash_discount_view.xml
+++ b/addons/account_cash_discount/account_cash_discount_view.xml
@@ -37,7 +37,7 @@
 			<field name="inherit_id" ref="account.view_payment_term_form"/>
 			<field name="arch" type="xml">
 				<field name="line_ids" position="after">
-					<field name="cash_discount_ids" colspan="3"/>
+					<field name="cash_discount_ids" colspan="4"/>
 					<separator string="Cash Discount" colspan="4"/>
 				</field>
 			</field>
diff --git a/addons/airport/custom_view.xml b/addons/airport/custom_view.xml
index 86736e7bcec..166d2509e1c 100644
--- a/addons/airport/custom_view.xml
+++ b/addons/airport/custom_view.xml
@@ -34,10 +34,10 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Flight">
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="city" select="1" />
 				<field name="country_id" select="1" />
-				<field name="lines" colspan="3"/>
+				<field name="lines" colspan="4"/>
 			</form>
 		</field>
 	</record>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 8ba98ce04d5..9a8fadf0420 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -13,7 +13,7 @@
 					<field name="log_write" />
 					<field name="log_unlink" />
 					<field name="log_create" />
-					<field name="user_id" select="1" colspan="3"/>
+					<field name="user_id" select="1" colspan="4"/>
 					<field name="state" select="1" readonly="1" />
 					<group colspan="2" col="2">
 						<button string="Subscribe" name="subscribe" type="object" states="draft"/>
@@ -66,7 +66,7 @@
 					<field name="object_id" select="1" readonly="1"/>
 					<field name="method" select="1" readonly="1"/>
 					<field name="user_id" select="1" readonly="1"/>
-					<field name="args" select="1" readonly="1" colspan="3"/>
+					<field name="args" select="1" readonly="1" colspan="4"/>
 				</form>
 			</field>
 		</record>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 07fdd491f83..647f32767d1 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -23,7 +23,7 @@
 					<field name="type" select="1"/>
 					<field name="user_id" select="1"/>
 					<field name="date" select="1"/>
-					<field name="note" colspan="3"/>
+					<field name="note" colspan="4"/>
 				</form>
 			</field>
 		</record>
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index 511568e6c55..8c50817610a 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -16,16 +16,16 @@
 							<action
 								string="Your open quotations"
 								name="%(sale.action_order_tree10)d"
-								colspan="3"
+								colspan="4"
 								height="200"
 								width="510"/>
 							<action string="Top ten sales of the month"
 								name="%(report_sale.action_order_sale_list)d"
-								colspan="3"/>
+								colspan="4"/>
 							<action
 								string="Cases statistics"
 								name="%(report_crm.action_report_crm_case_user_tree_month_my)d"
-								colspan="3"/>
+								colspan="4"/>
 						</child1>
 
 						<child2>
@@ -39,12 +39,12 @@
 							<action
 								string="Sales of the month"
 								name="%(report_sale.action_order_category_tree_all)d"
-								view_mode="graph,tree" colspan="3"/>
+								view_mode="graph,tree" colspan="4"/>
 							<action 
 								string="Cases of the month"
 								name="%(report_crm.action_report_crm_case_user_tree_month)d"
 								view_mode="graph,tree"
-								colspan="3"/>
+								colspan="4"/>
 						</child2>
 					</hpaned>
 				</form>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 9043b4973a3..520ec7b45c0 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -149,18 +149,18 @@
 					<field name="act_remind_user"/>
 					<field name="act_remind_partner"/>
 					<field name="act_remind_attach"/>
-					<field name="act_email_cc" colspan="3"/>
+					<field name="act_email_cc" colspan="4"/>
 					<!--
-					<field name="act_method" colspan="3" readonly="1"/>
+					<field name="act_method" colspan="4" readonly="1"/>
 					-->
 
 				</page><page string="E-Mail Information">
-					<separator string="Email to send" colspan="3"/>
+					<separator string="Email to send" colspan="4"/>
 					<field name="act_mail_to_user"/>
 					<field name="act_mail_to_partner"/>
 					<field name="act_mail_to_watchers"/>
-					<field name="act_mail_to_email" colspan="3"/>
-					<field name="act_mail_body" colspan="3"/>
+					<field name="act_mail_to_email" colspan="4"/>
+					<field name="act_mail_body" colspan="4"/>
 					<group col="2" colspan="4" string="Special Keywords">
 						<label align="0.0" string="%%(case_id)s = Case ID"/>
 						<label align="0.0" string="%%(case_subject)s = Case subject"/>
@@ -248,7 +248,7 @@
 						<button name="remind_partner" string="Send Reminder" states="open,pending" type="object"/>
 					</group>
 					<separator string="Next Action" colspan="4"/>
-					<field name="description" colspan="3" select="1"/>
+					<field name="description" colspan="4" select="1"/>
 					<field name="som" select="1"/>
 					<field name="canal_id"/>
 					<field name="date_deadline" select="1"/>
@@ -272,8 +272,8 @@
 					<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
 					<field name="date_closed"/>
 					<field name="active" select="1"/>
-					<field name="ref" colspan="3"/>
-					<field name="ref2" colspan="3"/>
+					<field name="ref" colspan="4"/>
+					<field name="ref2" colspan="4"/>
 					<field name="planned_revenue"/>
 					<field name="planned_cost"/>
 					<field name="probability"/>
@@ -281,18 +281,18 @@
 					<field name="date_action_last"/>
 					<field name="date_action_next"/>
 
-					<field name="email_cc" colspan="3"/>
-					<field name="email_last" colspan="3"/>
+					<field name="email_cc" colspan="4"/>
+					<field name="email_last" colspan="4"/>
 				</page><page string="History">
 					<field name="history_line" nolabel="1" colspan="4" widget="one2many_list">
 						<form string="Actions">
 							<separator string="Action Information" colspan="4"/>
-							<field name="name" colspan="3"/>
+							<field name="name" colspan="4"/>
 							<field name="date" select="1"/>
 							<field name="user_id" select="1"/>
 							<field name="som" select="1"/>
 							<field name="canal_id"/>
-							<field name="description" colspan="3"/>
+							<field name="description" colspan="4"/>
 						</form>
 					</field>
 				</page>
@@ -352,13 +352,13 @@
 		<field name="arch" type="xml">
 			<form string="Cases">
 				<separator string="Case Description" colspan="4"/>
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="date" select="1"/>
 				<field name="user_id" select="1"/>
 				<field name="case_id" select="1"/>
 				<field name="som" select="1"/>
 				<field name="canal_id" select="1"/>
-				<field name="description" colspan="3" select="1"/>
+				<field name="description" colspan="4" select="1"/>
 			</form>
 		</field>
 	</record>
@@ -424,10 +424,10 @@
 					<separator string="Segmentation Description" colspan="4"/>
 					<field name="name" select="1"/>
 					<field name="exclusif"/>
-					<field name="description" select="1" colspan="3"/>
-					<field name="categ_id" select="1" colspan="3"/>
+					<field name="description" select="1" colspan="4"/>
+					<field name="categ_id" select="1" colspan="4"/>
 					<separator string="Segmentation Test" colspan="4"/>
-					<field name="segmentation_line" widget="one2many_list" colspan="3"/>
+					<field name="segmentation_line" widget="one2many_list" colspan="4"/>
 					<field name="state"/>
 					<group col="3" colspan="2">
 						<button name="process_start" states="not running" string="Compute Segmentation" type="object"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 0e6cbc71934..13839ca6d45 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -71,8 +71,8 @@
 					<separator colspan="4" string="Grid Lines"/>
 					<field name="line_ids" select="1" colspan="4" nolabel="1"/>
 				</page><page string="Destination">
-					<field name="country_ids" colspan="3"/>
-					<field name="state_ids" colspan="3"/>
+					<field name="country_ids" colspan="4"/>
+					<field name="state_ids" colspan="4"/>
 					<field name="zip_from"/>
 					<field name="zip_to"/>
 				</page>
@@ -96,7 +96,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Grid Lines">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="type" string="Condition"/>
 				<field name="operator" nolabel="1"/>
 				<field name="max_value" nolabel="1"/>
diff --git a/addons/esale_ez/esale_view.xml b/addons/esale_ez/esale_view.xml
index ba5e6eed03d..c403eba1f9c 100644
--- a/addons/esale_ez/esale_view.xml
+++ b/addons/esale_ez/esale_view.xml
@@ -23,8 +23,8 @@
 				<field name="active" select="1"/>
 				<field name="shop_id" select="1"/>
 				<field name="product_all"/>
-				<field name="partner_anonymous_id" colspan="3"/>
-				<field name="product_ids" colspan="3"/>
+				<field name="partner_anonymous_id" colspan="4"/>
+				<field name="product_ids" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -60,7 +60,7 @@
 			<form string="eSale Order">
 				<notebook>
 					<page string="Order Line">
-						<field name="name" select="1" colspan="3"/>
+						<field name="name" select="1" colspan="4"/>
 						<field name="partner_id" select="1"/>
 						<field name="date_order" select="1"/>
 						<field name="web_id" select="1"/>
@@ -72,8 +72,8 @@
 						<button type="object" name="order_cancel" states="draft" string="Cancel Order"/>
 					</page>
 					<page string="Others data">
-						<field name="order_id" colspan="3"/>
-						<field name="note" colspan="3"/>
+						<field name="order_id" colspan="4"/>
+						<field name="note" colspan="4"/>
 					</page>
 				</notebook>
 			</form>
@@ -105,8 +105,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="eSales Order Line">
-				<field name="name" colspan="3"/>
-				<field name="product_id" colspan="3"/>
+				<field name="name" colspan="4"/>
+				<field name="product_id" colspan="4"/>
 				<field name="product_qty"/>
 				<field name="product_uom"/>
 
@@ -150,8 +150,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="eSale user">
-				<field name="name" select="1" colspan="3"/>
-				<field name="partner_id" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
+				<field name="partner_id" select="1" colspan="4"/>
 				<field name="web_id"/>
 				<field name="web_ref"/>
 				<field name="picking_policy"/>
diff --git a/addons/esale_joomla/esale_joomla_view.xml b/addons/esale_joomla/esale_joomla_view.xml
index d41a1aaab3e..dae82133530 100644
--- a/addons/esale_joomla/esale_joomla_view.xml
+++ b/addons/esale_joomla/esale_joomla_view.xml
@@ -10,7 +10,7 @@
 				<notebook>
 					<page string="General Informations">
 						<separator string="Web Shop Info" colspan="4"/>
-						<field name="name" select="1" colspan="3"/>
+						<field name="name" select="1" colspan="4"/>
 						<field name="url" widget="url" required="1"/>
 						<field name="active" select="1"/>
 						<field name="shop_id" select="1" required="1"/>
@@ -110,8 +110,8 @@
 						<button type="object" name="order_cancel" states="draft" string="Cancel Order"/>
 					</page>
 					<page string="Others data">
-						<field name="order_id" colspan="3"/>
-						<field name="note" colspan="3"/>
+						<field name="order_id" colspan="4"/>
+						<field name="note" colspan="4"/>
 					</page>
 				</notebook>
 			</form>
@@ -143,8 +143,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="eSales Order Line">
-				<field name="name" colspan="3"/>
-				<field name="product_id" colspan="3"/>
+				<field name="name" colspan="4"/>
+				<field name="product_id" colspan="4"/>
 				<field name="product_qty"/>
 				<field name="product_uom_id"/>
 				<field name="price_unit"/>
diff --git a/addons/esale_osc/esale_osc_view.xml b/addons/esale_osc/esale_osc_view.xml
index fcba3c7589e..f35556ef80b 100644
--- a/addons/esale_osc/esale_osc_view.xml
+++ b/addons/esale_osc/esale_osc_view.xml
@@ -12,7 +12,7 @@
 				<notebook>
 					<page string="General Informations">
 						<separator string="esale_osc Shop Info" colspan="4"/>
-						<field name="name" select="1" colspan="3"/>
+						<field name="name" select="1" colspan="4"/>
 						<field name="url" widget="url" required="1"/>
 						<field name="active" select="1"/>
 						<field name="shop_id" select="1" required="1"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c96fa3406f3..340b6e1aee9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,7 +22,7 @@
 							<field name="company_id"/>
 							<field name="user_id"/>
 							<field name="address_id"/>
-							<field name="notes" colspan="3"/>
+							<field name="notes" colspan="4"/>
 							<separator string="Working Data" colspan="4" />
 							<field name="regime" />
 							<field name="active" select="1" />
@@ -38,7 +38,7 @@
 							</group>
 						</page>
 						<page string="Holidays">
-							<field name="holidays" colspan="3"
+							<field name="holidays" colspan="4"
 								widget="one2many_list"
 								nolabel="1" />
 						</page>
@@ -187,7 +187,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Timesheet">
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="date_from" />
 					<field name="dayofweek" select="1" />
 					<field name="hour_from"/>
@@ -204,7 +204,7 @@
 			<field name="arch" type="xml">
 				<form string="Employee attendance">
 					<field name="employee_id" select="1"/>
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="action" select="1"/>
 					<field name="action_desc"  select="1"/>
 				</form>
@@ -305,7 +305,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Employee holidays">
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="date_from"  select="1"/>
 					<field name="date_to"  select="1"/>
 					<newline />
@@ -335,7 +335,7 @@
 				<form string="Vacations requests">
 					<field name="name" select="1"/>
 					<field name="holiday_status"/>
-					<field name="employee_id" colspan="3" select="1"/>
+					<field name="employee_id" colspan="4" select="1"/>
 					<newline />
 					<field name="date_from"  select="1"/>
 					<field name="date_to"  select="1"/>
@@ -359,7 +359,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Define holiday status">
-					<field name="name" colspan="3"  select="1"/>
+					<field name="name" colspan="4"  select="1"/>
 				</form>
 			</field>
 		</record>
@@ -390,7 +390,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Define attendance reason">
-					<field name="name" colspan="3"  select="1"/>
+					<field name="name" colspan="4"  select="1"/>
 					<field name="action_type"  select="1"/>
 				</form>
 			</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 52f012697c3..d6263bd0f4a 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -68,7 +68,7 @@
 
 							<form string="Edit Contract">
 								<separator string="Generalities" colspan="4"/>
-								<field name="name" colspan="3" select="1"/>
+								<field name="name" colspan="4" select="1"/>
 								<newline/>
 								<separator string="Contract Duration" colspan="4"/>
 								<field name="function"/>
diff --git a/addons/hr_contract_available/hr_contract_available_view.xml b/addons/hr_contract_available/hr_contract_available_view.xml
index c1ec069979a..a49ec6c1355 100644
--- a/addons/hr_contract_available/hr_contract_available_view.xml
+++ b/addons/hr_contract_available/hr_contract_available_view.xml
@@ -22,7 +22,7 @@
 							</tree>
 
 							<form string="Allocations">
-								<field name="name" colspan="3"/>
+								<field name="name" colspan="4"/>
 								<field name="department_id"/>
 								<field name="function"/>
 								<field name="date_start"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5629643ebdd..81f68a3a4c9 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -7,7 +7,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Evalution Quote">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="type_id" select="1"/>
 					<field name="value_id" select="1"/>
 				</form>
@@ -131,7 +131,7 @@
 						<separator string="To Improve" colspan="2"/>
 						<separator string="Employee Response" colspan="2"/>
 						<field name="info_improve" colspan="2" nolabel="1" readonly="1"/>
-						<field name="info_employee" colspan="3" nolabel="1" readonly="1"/>
+						<field name="info_employee" colspan="4" nolabel="1" readonly="1"/>
 						<separator string="Status" colspan="4"/>
 						<field name="state" search="1"/>
 						<button string="Done" states="draft"/>
diff --git a/addons/hr_skill/hr_skill_view.xml b/addons/hr_skill/hr_skill_view.xml
index be50d095b23..19b08626efa 100644
--- a/addons/hr_skill/hr_skill_view.xml
+++ b/addons/hr_skill/hr_skill_view.xml
@@ -65,8 +65,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Positions">
-				<field name="name" select="1" colspan="3"/>
-				<field name="profile_ids" colspan="3"> 
+				<field name="name" select="1" colspan="4"/>
+				<field name="profile_ids" colspan="4"> 
 					<tree string="Profiles" editable="top">
 						<field name="profile_id" on_change="onchange_profile_id(profile_id)"/>
 						<field name="weight_id"/>
@@ -95,8 +95,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Profile">
-				<field name="name" select="1" colspan="3"/>
-				<field name="skill_ids" colspan="3"> 
+				<field name="name" select="1" colspan="4"/>
+				<field name="skill_ids" colspan="4"> 
 					<tree string="Skills" editable="top">
 						<field name="skill_id" on_change="onchange_skill_id(skill_id)"/>
 						<field name="weight_id"/>
@@ -211,7 +211,7 @@
 			<form string="Experiences">
 				<field name="name" select="1" />
 				<field name="category_id" select="1" />
-				<field name="skill_ids" colspan="3"> 
+				<field name="skill_ids" colspan="4"> 
 					<tree string="Skills" editable="top">
 					        <field name="skill_id" on_change="onchange_skill_id(skill_id)"/>
 						<field name="weight_id"/>
@@ -258,12 +258,12 @@
 					<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
 					<field name="reference" />
 					<field name="category_id" />
-					<field name="note" colspan="3"/>
+					<field name="note" colspan="4"/>
 
 
 			   </page>
 			   <page string="Skill and experiences">
-					<field name="experience_ids" colspan="3" nolanel="1">
+					<field name="experience_ids" colspan="4" nolanel="1">
 					  <tree string="Experiences"
 					editable="top" nolabel="1" >
 						 <field name="experience_id" on_change="onchange_experience_id(experience_id)"/>
@@ -271,7 +271,7 @@
 						 <field name="name"/>
 					  </tree>
 					</field>
-					<field name="skill_ids" colspan="3" nolanel="1">
+					<field name="skill_ids" colspan="4" nolanel="1">
 					  <tree string="Skills"
 						 editable="top" nolabel="1" >
 						 <field name="skill_id" on_change="onchange_skill_id(skill_id)"/>
diff --git a/addons/hr_skill/old-hr_skill_view.xml b/addons/hr_skill/old-hr_skill_view.xml
index 6bbb541ac81..3653390f94d 100644
--- a/addons/hr_skill/old-hr_skill_view.xml
+++ b/addons/hr_skill/old-hr_skill_view.xml
@@ -8,10 +8,10 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Skills">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="parent_id" select="1"/>
 				<field name="view" select="1"/>
-				<field name="child_ids" colspan="3"/>
+				<field name="child_ids" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -61,8 +61,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Positions">
-				<field name="name" select="1" colspan="3"/>
-				<field name="profile_ids" colspan="3"> 
+				<field name="name" select="1" colspan="4"/>
+				<field name="profile_ids" colspan="4"> 
 					<tree string="Profiles" editable="top">
 						<field name="name"/>
 						<field name="weight_id"/>
@@ -92,8 +92,8 @@
 		<field name="view_mode">form,tree</field>
 		<field name="arch" type="xml">
 			<form string="Profile">
-				<field name="name" select="1" colspan="3"/>
-				<field name="skill_ids" colspan="3"> 
+				<field name="name" select="1" colspan="4"/>
+				<field name="skill_ids" colspan="4"> 
 					<tree string="Skills" editable="top">
 						<field name="name"/>
 						<field name="weight_id"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index b851aff5831..10e7698c5aa 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -25,7 +25,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Timesheet Lines">
-					<field name="name" colspan="3"/>
+					<field name="name" colspan="4"/>
 					<field name="user_id" select="1" required="1"/>
 					<field name="date" select="1"/>
 					<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" />
diff --git a/addons/l10n_ch/dta/dta_view.xml b/addons/l10n_ch/dta/dta_view.xml
index 1d1fd3a4c1e..e2993c6a770 100644
--- a/addons/l10n_ch/dta/dta_view.xml
+++ b/addons/l10n_ch/dta/dta_view.xml
@@ -102,8 +102,8 @@
 			<field name="bank" />
 			<field name="date" />
 			<field name="user_id" />
-			<field name="dta_line_ids" colspan="3"/>
-			<field name="note" colspan="3"/>
+			<field name="dta_line_ids" colspan="4"/>
+			<field name="note" colspan="4"/>
 			</form>
 		</field>
 	</record>
diff --git a/addons/letter/letter_view.xml b/addons/letter/letter_view.xml
index ab274556718..70eafe45afe 100644
--- a/addons/letter/letter_view.xml
+++ b/addons/letter/letter_view.xml
@@ -8,9 +8,9 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Letter Type">
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="template" select="1"/>
-				<field name="paragraph_ids" colspan="3"/>
+				<field name="paragraph_ids" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -23,11 +23,11 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Letter">
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="partner_id" select="1"/>
 				<field name="type_id" on_change="onchange_type_id(type_id)"/>
 				<newline/>
-				<field name="paragraph_ids" colspan="3" widget="one2many_list"/>
+				<field name="paragraph_ids" colspan="4" widget="one2many_list"/>
 				<separator string="States" colspan="4"/>
 				<field name="state" select="1"/>
 				<group col="2" colspan="2">
@@ -83,10 +83,10 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Letter Paragraph">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="sequence"/>
 				<field name="type_id"/>
-				<field name="content" colspan="3" widget="text_tag"/>
+				<field name="content" colspan="4" widget="text_tag"/>
 			</form>
 		</field>
 	</record>
@@ -101,10 +101,10 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Letter Paragraph">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="type_id" select="1"/>
 				<field name="sequence"/>
-				<field name="content" colspan="3" widget="text_tag"/>
+				<field name="content" colspan="4" widget="text_tag"/>
 			</form>
 		</field>
 	</record>
@@ -127,7 +127,7 @@
 			<form string="Letter type">
 				<field name="name"/>
 				<field name="template" />
-				<field name="paragraph_ids" colspan="3"/>
+				<field name="paragraph_ids" colspan="4"/>
 			</form>
 		</field>
 	</record>
diff --git a/addons/marketing/campaign/campaign_view.xml b/addons/marketing/campaign/campaign_view.xml
index b2348b1cc09..b3643bb21f3 100644
--- a/addons/marketing/campaign/campaign_view.xml
+++ b/addons/marketing/campaign/campaign_view.xml
@@ -21,15 +21,15 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Campaign Definition">
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="costs"/>
 				<newline/>
 				<field name="date_start"/>
 				<field name="date_stop"/>
 				<field name="planned_costs"/>
 				<field name="planned_revenue"/>
-				<field name="info" colspan="3"/>
-				<field name="step_id" colspan="3" widget="one2many_list"/>
+				<field name="info" colspan="4"/>
+				<field name="step_id" colspan="4" widget="one2many_list"/>
 			</form>
 		</field>
 	</record>
@@ -75,7 +75,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Marketing Steps">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="priority" select="1"/>
 				<field name="active" select="1"/>
 				<field name="start_date" select="1"/>
@@ -84,7 +84,7 @@
 				<field name="costs"/>
 				<field name="max_try"/>
 				<newline/>
-				<field name="info" colspan="3"/>
+				<field name="info" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -95,7 +95,7 @@
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
 			<tree string="Marketing Prospects">
-				<field name="partner_id" colspan="3"/>
+				<field name="partner_id" colspan="4"/>
 				<field name="contact"/>
 				<field name="step" select="1"/>
 				<field name="user_id" select="1"/>
@@ -114,21 +114,21 @@
 				<notebook>
 				<page string="Main Information">
 					<separator string="Prospect Information" colspan="4"/>
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="user_id" select="1"/>
 					<field name="active" select="1"/>
 					<field name="partner_id" select="1"/>
 					<field name="campaign_id"/>
 					<field name="part_adr_id"/>
 					<field name="contact"/>
-					<field name="notes" colspan="3"/>
+					<field name="notes" colspan="4"/>
 					<separator string="Step Information" colspan="4"/>
 					<field name="step" select="1" domain="[('campaign_id','=',campaign_id)]"/>
 					<field name="priority" select="1"/>
 					<field name="date_recall" colspan="2"/>
 					<button name="recall" type="object" string="Call again Later" states="draft"/>
 					<newline/>
-					<field name="info" colspan="3"/>
+					<field name="info" colspan="4"/>
 					<field name="state" select="1"/>
 					<group col="2" colspan="2">
 						<button name="stop_camp" type="object" string="Stop Campaign" states="draft,wait"/>
@@ -149,7 +149,7 @@
 		<field name="arch" type="xml">
 			<form string="History">
 <!--
-				<field name="name" colspan="3"/>
+				<field name="name" colspan="4"/>
 -->				
 				<field name="step_id"/>
 				<field name="date"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6f90ced45d1..5a7f6c45852 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -15,8 +15,8 @@
 		<field name="arch" type="xml">
 			<form string="Property Groups">
 				<separator string="General Information" colspan="4"/>
-				<field name="name" select="1" colspan="3"/>
-				<field name="description" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
+				<field name="description" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -49,11 +49,11 @@
 		<field name="arch" type="xml">
 			<form string="Properties">
 				<separator string="General Information" colspan="4"/>
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="group_id" select="1"/>
 				<field name="composition" select="1"/>
 				<separator string="Description" colspan="4"/>
-				<field name="description" colspan="3"/>
+				<field name="description" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -90,12 +90,12 @@
 				<notebook>
 				<page string="Workcenter">
 					<separator string="General Information" colspan="4"/>
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="code" select="1"/>
 					<field name="active" select="1"/>
 					<field name="type"/>
 					<field name="timesheet_id"/>
-					<field name="note" colspan="3"/>
+					<field name="note" colspan="4"/>
 					<separator string="Capacity Information" colspan="4"/>
 					<field name="capacity_per_cycle"/>
 					<newline/>
@@ -150,12 +150,12 @@
 		<field name="arch" type="xml">
 			<form string="Routing Workcenters">
 				<separator string="General Information" colspan="4"/>
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="sequence" select="1"/>
 				<field name="workcenter_id" select="1"/>
 				<field name="cycle_nbr"/>
 				<field name="hour_nbr"/>
-				<field name="note" colspan="3"/>
+				<field name="note" colspan="4"/>
 			</form>
 		</field>
 	</record>
@@ -167,11 +167,11 @@
 		<field name="arch" type="xml">
 			<form string="Routing">
 				<separator string="General Information" colspan="4"/>
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="code" select="1"/>
 				<field name="active" select="1"/>
 				<field name="location_id"/>
-				<field name="note" colspan="3"/>
+				<field name="note" colspan="4"/>
 				<separator string="Workcenter Operations" colspan="4"/>
 				<field name="workcenter_lines" widget="one2many_list" colspan="4" nolabel="1"/>
 			</form>
@@ -361,7 +361,7 @@
 			<form string="Production Orders">
 				<notebook>
 				<page string="General">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="date_planned" select="1"/>
 					<field name="priority"/>
 
@@ -444,8 +444,8 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Production Workcenters">
-				<field name="name" colspan="3" select="1"/>
-				<field name="workcenter_id" select="1" colspan="3"/>
+				<field name="name" colspan="4" select="1"/>
+				<field name="workcenter_id" select="1" colspan="4"/>
 				<field name="sequence"/>
 				<field name="cycle"/>
 				<field name="hour"/>
@@ -473,7 +473,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Production Products">
-				<field name="move_id" colspan="3" on_change="onchange_lot_line_id(lot_id)"/>
+				<field name="move_id" colspan="4" on_change="onchange_lot_line_id(lot_id)"/>
 				<field name="name"/>
 				<field name="product_id"/>
 				<field name="product_uom"/>
@@ -553,7 +553,7 @@
 		<field name="arch" type="xml">
 			<form string="Procurement">
 				<separator string="General Information" colspan="4"/>
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="priority"/>
 				<field name="date_planned" select="1"/>
 				<field name="procure_method" select="1"/>
@@ -567,9 +567,9 @@
 				<field name="origin" select="1"/>
 				<field name="move_id"/>
 				<newline/>
-				<field name="message" colspan="3"/>
+				<field name="message" colspan="4"/>
 				<separator string="Properties" colspan="4"/>
-				<field name="property_ids" colspan="3"/>
+				<field name="property_ids" colspan="4"/>
 				<separator string="Document State" colspan="4"/>
 				<field name="state" readonly="1" select="1"/>
 				<group col="5" colspan="2">
diff --git a/addons/network/network_view.xml b/addons/network/network_view.xml
index 7aef2b6c1d6..b9c385925fb 100644
--- a/addons/network/network_view.xml
+++ b/addons/network/network_view.xml
@@ -14,7 +14,7 @@
 					<notebook>
 					<page string="Material Info">
 						<separator string="Informations" colspan="4"/>
-						<field name="name" colspan="3" select="1"/>
+						<field name="name" colspan="4" select="1"/>
 						<field name="type" select="1"/>
 						<field name="supplier" select="1" />
 						<field name="date" select="1"/>
@@ -123,8 +123,8 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Software Type">
-					<field name="name" colspan="3" select="1"/>
-					<field name="note" colspan="3"/>
+					<field name="name" colspan="4" select="1"/>
+					<field name="note" colspan="4"/>
 				</form>
 			</field>
 		</record>
@@ -163,8 +163,8 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Add a password">
-					<field name="login" colspan="3"/>
-					<field name="password" colspan="3"/>
+					<field name="login" colspan="4"/>
+					<field name="password" colspan="4"/>
 				</form>
 			</field>
 		</record>
@@ -187,7 +187,7 @@
 			<field name="arch" type="xml">
 				<form string="Network Softwares">
 					<separator string="General Informations" colspan="4"/>
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="type"/>
 					<field name="date" select="1"/>
 					<field name="email" select="1"/>
@@ -239,16 +239,16 @@
 			<field name="arch" type="xml">
 				<form string="Network Element">
 					<separator string="Network Definition" colspan="4"/>
-					<field name="name" colspan="3" select="1"/>
-					<field name="range" colspan="3" select="1"/>
-					<field name="user_id" colspan="3"  select="1"/>
-					<field name="contact_id" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
+					<field name="range" colspan="4" select="1"/>
+					<field name="user_id" colspan="4"  select="1"/>
+					<field name="contact_id" colspan="4" select="1"/>
 					<field name="material_ids" nolabel="1" colspan="4" widget="one2many_list">
 						<form string="Network Material">
 							<notebook>
 							<page string="Material Info">
 								<separator string="Informations" colspan="4"/>
-								<field name="name" colspan="3" select="1"/>
+								<field name="name" colspan="4" select="1"/>
 								<field name="type" select="1"/>
 								<field name="supplier" select="1" />
 								<field name="date" select="1"/>
@@ -283,9 +283,9 @@
 			<field name="arch" type="xml">
 				<form string="Enter a diary entry">
 					<separator string="Diary entry" colspan="4" />
-					<field name="name" colspan="3" select="1" />
-					<field name="date" colspan="3" select="1"/>
-					<field name="description" colspan="3" />
+					<field name="name" colspan="4" select="1" />
+					<field name="date" colspan="4" select="1"/>
+					<field name="description" colspan="4" />
 				</form>
 			</field>
 		</record>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 32d4bfa1feb..b33823ba80e 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -12,7 +12,7 @@
 			<form string="Pricelist Version">
 				<field name="name" select="1"/>
 				<field name="active" select="1"/>
-				<field name="pricelist_id" colspan="3"/>
+				<field name="pricelist_id" colspan="4"/>
 				<field name="date_start" select="1"/>
 				<field name="date_end" select="1"/>
 				<field name="items_id" colspan="4" nolabel="1" widget="one2many_list"/>
@@ -35,7 +35,7 @@
 		<field name="arch" type="xml">
 			<tree string="Products Listprices Items">
 				<field name="sequence"/>
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="product_tmpl_id" select="1"/>
 				<field name="categ_id" select="1"/>
 				<field name="min_quantity"/>
@@ -51,7 +51,7 @@
 		<field name="arch" type="xml">
 			<form string="Products Listprices Items">
 				<separator string="Rules Test Match" colspan="4"/>
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="product_id" select="1" on_change="product_id_change(product_tmpl_id)"/>
 				<field name="product_tmpl_id" select="1"/>
 				<field name="categ_id" select="1"/>
@@ -98,7 +98,7 @@
 		<field name="arch" type="xml">
 			<form string="Products Price List">
 				<separator string="Pricelist Name" colspan="4"/>
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="type" select="1"/>
 				<field name="currency_id" select="1"/>
 				<field name="active" select="1"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 875585a1379..cb22893e527 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -148,7 +148,7 @@
 				<form string="Product Template">
 					<notebook>
 						<page string="Information">
-							<field name="name" colspan="3" select="1"/>
+							<field name="name" colspan="4" select="1"/>
 							<field name="categ_id" select="1"/>
 							<field name="type" select="1"/>
 							<field name="volume" digits="(14, 3)"/>
@@ -159,7 +159,7 @@
 							<field name="state"/>
 							<field name="uom_id"/>
 							<field name="uom_po_id"/>
-							<field name="description" colspan="3"/>
+							<field name="description" colspan="4"/>
 							<newline/>
 							<field name="list_price"/>
 							<field name="standard_price"/>
@@ -305,7 +305,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Unit of Measure categories">
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 				</form>
 			</field>
 		</record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 96d900efbc9..b55e05097e4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,7 +32,7 @@
 							<field name="members" colspan="4" nolabel="1"/>
 						</page>
 						<page string="Partner Info">
-							<field name="partner_id" select="1" colspan="3" on_change="onchange_partner_id(partner_id)"/>
+							<field name="partner_id" select="1" colspan="4" on_change="onchange_partner_id(partner_id)"/>
 							<field name="contact_id" select="1" domain="[('partner_id','=',partner_id)]"/>
 							<field name="category_id"/>
 							<field name="pricelist_id"/>
@@ -51,7 +51,7 @@
 								<label string="Date Stop: %%(date_stop)s"/>
 							</group>
 							<separator string="Taxes" colspan="4" />
-							<field name="tax_ids" colspan="3"/>
+							<field name="tax_ids" colspan="4"/>
 						</page>
 						<page string="Tasks">
 							<field name="tasks" nolabel="1" colspan="4" widget="one2many_list">
@@ -85,7 +85,7 @@
 										</page>
 										<page string="Others">
 											<separator string="Notes" colspan="4"/>
-											<field name="invoice_id" readonly="True" colspan="3"/>
+											<field name="invoice_id" readonly="True" colspan="4"/>
 											<field name="notes" colspan="4" nolabel="1"/>
 											<separator string="Customer Description" colspan="4"/>
 											<field name="cust_desc" colspan="4"  nolabel="1"/>
@@ -154,7 +154,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Task Work">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="hours" select="1"/>
 					<field name="date" select="1"/>
 					<field name="user_id" select="1"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a28c829c749..35ed7d8c830 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -52,8 +52,8 @@
 						<field name="location_id"/>
 						<field name="invoice_method"/>
 						<newline/>
-						<field name="invoice_id" colspan="3"/>
-						<field name="picking_ids" colspan="3"/>
+						<field name="invoice_id" colspan="4"/>
+						<field name="picking_ids" colspan="4"/>
 					</page>
 					<page string="Notes">
 						<field name="validator" />
@@ -132,14 +132,14 @@
 						<newline/>
 						<field name="product_qty"/>
 						<field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id)"/>
-						<field name="product_id" colspan="3" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id)" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id"/>
-						<field name="name" colspan="3"/>
+						<field name="product_id" colspan="4" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id)" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id"/>
+						<field name="name" colspan="4"/>
 						<field name="date_planned"/>
 						<field name="price_unit"/>
 						<field name="price_subtotal" readonly="1" />
-						<field name="taxes_id" colspan="3"/>
+						<field name="taxes_id" colspan="4"/>
 					</page><page string="Notes">
-						<field name="notes" colspan="3" nolabel="1"/>
+						<field name="notes" colspan="4" nolabel="1"/>
 					</page>
 				</notebook>
 			</form>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b53c12dfc60..596980c8a0d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -79,16 +79,16 @@
 					<separator string="Automatic Declaration" colspan="4"/>
 					<field name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id)" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" select="1"/>
 					<field name="product_uom"/>
-					<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'])" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" colspan="3" select="1"/>
+					<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'])" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" colspan="4" select="1"/>
 
 					<separator string="Manual Description" colspan="4"/>
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="price_unit" select="1"/>
 					<field name="discount"/>
 					<field name="type"/>
 					<field name="delay" select="1"/>
 					<newline/>
-					<field name="tax_id" colspan="3"/>
+					<field name="tax_id" colspan="4"/>
 					<separator string="States" colspan="4"/>
 					<field name="state" select="1"/>
 					<field name="invoiced" select="1"/>
@@ -110,7 +110,7 @@
 				</notebook>
 			</form>
 			<tree string="Sales Order Lines">
-				<field name="name" colspan="3"/>
+				<field name="name" colspan="4"/>
 				<field name="product_id"/>
 				<field name="product_uom_qty" string="Qty"/>
 				<field name="product_uom" string="UoM"/>
@@ -299,7 +299,7 @@
 						</group>
 					</page>
 					<page string="Notes">
-						<field name="note" colspan="3" nolabel="1"/>
+						<field name="note" colspan="4" nolabel="1"/>
 					</page>
 					<page string="Advanced">
 						<separator string="Shop" colspan="4"/>
@@ -356,7 +356,7 @@
 		<field name="arch" type="xml">
 			<tree string="Sales Order Lines">
 				<field name="order_id"/>
-				<field name="name" colspan="3"/>
+				<field name="name" colspan="4"/>
 				<field name="product_id"/>
 				<field name="product_uom_qty" string="Qty"/>
 				<field name="product_uom" string="UoM"/>
@@ -384,13 +384,13 @@
 					<field name="product_id" readonly="1" select="1"/>
 
 					<separator string="Manual Designation" colspan="4"/>
-					<field name="name" colspan="3" select="1"/>
+					<field name="name" colspan="4" select="1"/>
 					<field name="price_unit" select="1"/>
 					<field name="discount"/>
 					<field name="type"/>
 					<field name="delay" select="1"/>
 					<field name="price_subtotal"/>
-					<field name="tax_id" colspan="3"/>
+					<field name="tax_id" colspan="4"/>
 					<separator string="States" colspan="4"/>
 					<field name="state" select="1"/>
 					<group colspan="2" col="2">
@@ -402,7 +402,7 @@
 				</page><page string="Notes">
 					<field name="notes" colspan="4" nolabel="1"/>
 				</page><page string="Invoice Lines">
-					<field name="invoice_lines" colspan="3"/>
+					<field name="invoice_lines" colspan="4"/>
 				</page>
 				</notebook>
 			</form>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index b07ad1a4a4b..fc67cb06d74 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -10,7 +10,7 @@
 				<field name="active" select="1"/>
 				<field name="invoicing_method" select="1"/>
 				<newline/>
-				<field name="note" colspan="3"/>
+				<field name="note" colspan="4"/>
 			</form>
 		</field>
 	</record>
diff --git a/addons/sandwich/sandwich_view.xml b/addons/sandwich/sandwich_view.xml
index 6f5c48c4dda..265678884d5 100644
--- a/addons/sandwich/sandwich_view.xml
+++ b/addons/sandwich/sandwich_view.xml
@@ -160,11 +160,11 @@
 					<notebook>
 						<page string="Sandwich Order">
 							<separator string="Informations" colspan="4"/>
-							<field name="name" colspan="3" select="1"/>
+							<field name="name" colspan="4" select="1"/>
 							<field name="partner" select="1"/>
 							<field name="date" select="1"/>
 							<separator string="Order lines" colspan="4"/>
-							<field name="order_lines" colspan="3"/>
+							<field name="order_lines" colspan="4"/>
 						</page>
 						<page string="notes">
 							<field name="note" colspan="4" nolabel="1" select="1"/>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 7743786623c..b97fc98da4f 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -86,14 +86,14 @@
 			<form string="Scrum Product Backlog">
 				<notebook>
 				<page string="Product Backlog">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<field name="priority"/>
 					<field name="sequence"/>
 					<field name="project_id" select="1" />
 					<field name="sprint_id" select="1" />
 					<field name="user_id" select="1" />
 					<field name="active" select="1" />
-					<field name="note" colspan="3"/>
+					<field name="note" colspan="4"/>
 					<field name="state" select="1"/>
 					<field name="progress"/>
 					<field name="effective_hours"/>
@@ -160,7 +160,7 @@
 			<form string="Scrum Sprint">
 				<notebook>
 				<page string="Sprint Info">
-					<field name="name" select="1" colspan="3"/>
+					<field name="name" select="1" colspan="4"/>
 					<newline/>
 					<field name="project_id" on_change="onchange_project_id(project_id)"/>
 					<newline/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c63cb99a439..06a73d601bc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -26,7 +26,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Stock Inventory Lines">
-				<field name="location_id" colspan="3" select="1" domain="[('usage','=','internal')]"/>
+				<field name="location_id" colspan="4" select="1" domain="[('usage','=','internal')]"/>
 				<field name="product_id" select="1"  on_change="on_change_product_id(location_id,product_id,product_uom)" context="location=location_id,uom=product_uom"/>
 				<field name="product_uom"/>
 				<field name="product_qty"/>
@@ -164,7 +164,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Stock Lot">
-				<field name="name" colspan="3" select="1"/>
+				<field name="name" colspan="4" select="1"/>
 				<field name="active" select="1"/>
 				<field name="tracking" select="1"/>
 				<newline/>
@@ -340,7 +340,7 @@
 						<field name="account_id" select="1"/>
 						<field name="location_id"/>
 						<newline/>
-						<field name="comment" colspan="3"/>
+						<field name="comment" colspan="4"/>
 					</page>
 					<page string="Localisation">
 						<field name="posx"/>
@@ -418,7 +418,7 @@
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
 			<tree string="Picking List" color="red:state=='cancel'">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="date" select="1"/>
 				<field name="origin" select="1"/>
 				<field name="loc_move_id" select="1"/>
@@ -498,8 +498,8 @@
 					<field name="active" select="1"/>
 					<field name="auto_picking"/>
 					<newline/>
-					<field name="lot_id" colspan="3"/>
-					<field name="move_lot_id" colspan="3"/>
+					<field name="lot_id" colspan="4"/>
+					<field name="move_lot_id" colspan="4"/>
 				</page>
 				</notebook>
 			</form>
@@ -705,10 +705,10 @@
 		<field name="arch" type="xml">
 			<form string="Stock Moves">
 				<separator string="Move Information" colspan="4"/>
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="date"/>
 				<field name="date_planned"/>
-				<field name="product_id" colspan="3" select="1"/>
+				<field name="product_id" colspan="4" select="1"/>
 				<field name="product_uom" select="1"/>
 				<field name="product_qty" select="1"/>
 				<field name="location_id" select="1"/>
@@ -773,7 +773,7 @@
 		<field name="arch" type="xml">
 			<tree string="Incoterms">
 				<field name="code"/>
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 			</tree>
 		</field>
 	</record>
@@ -783,7 +783,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Incoterms">
-				<field name="name" select="1" colspan="3"/>
+				<field name="name" select="1" colspan="4"/>
 				<field name="code" select="1"/>
 				<field name="active" select="1"/>
 			</form>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 4f637595246..6ebc6aa79fc 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -25,8 +25,8 @@
 					<field name="interval_type"/>
 					<field name="exec_init"/>
 					<field name="date_init"/>
-					<field name="doc_source" colspan="3" widget="reference"/>
-					<field name="notes" colspan="3"/>
+					<field name="doc_source" colspan="4" widget="reference"/>
+					<field name="notes" colspan="4"/>
 					<separator string="State" colspan="4"/>
 					<field name="cron_id" colspan="4" readonly="1"/>
 					<field name="state" readonly="1"/>
@@ -72,7 +72,7 @@
 				<field name="name"/>
 				<field name="date"/>
 				<newline/>
-				<field name="document_id" colspan="3" widget="reference"/>
+				<field name="document_id" colspan="4" widget="reference"/>
 			</form>
 		</field>
 	</record>
@@ -88,7 +88,7 @@
 				<field name="model" select="1"/>
 				<field name="workflow_action"/>
 				<newline/>
-				<field name="field_ids" colspan="3" widget="one2many_list"/>
+				<field name="field_ids" colspan="4" widget="one2many_list"/>
 			</form>
 		</field>
 	</record>