diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce879ab389f..fa9ff515aef 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -455,37 +455,83 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template">
-                    <notebook>
+                    <group colspan="2" col="4">
+                        <separator string="Product Description" colspan="4"/>
+                        <field name="name" select="1"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Product Type" colspan="2"/>
+                        <field name="sale_ok" select="2"/>
+                        <field name="purchase_ok" select="2"/>
+                        <field groups="base.group_extended" name="rental" select="2"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Information">
-                            <field colspan="4" name="name" select="1"/>
-                            <field name="categ_id" select="1"/>
-                            <field name="type" select="1"/>
-                            <field digits="(14, 3)" name="volume"/>
-                            <newline/>
-                            <field digits="(14, 3)" name="weight"/>
-                            <field digits="(14, 3)" name="weight_net"/>
-                            <field name="procure_method"/>
-                            <field name="state"/>
-                            <field name="uom_id"/>
-                            <field name="uom_po_id"/>
-                            <field colspan="4" name="description"/>
-                            <newline/>
-                            <field name="list_price"/>
-                            <field name="standard_price"/>
-                            <field name="product_manager"/>
-                            <field name="cost_method"/>
+                            <group colspan="2" col="2">
+                                <separator string="Procurement" colspan="2"/>
+                                <field name="type" select="2"/>
+                                <field name="procure_method"/>
+                                <field name="supply_method"/>
+                            </group>
+
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Weigths" colspan="2"/>
+                                <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="status">
+                                <separator string="Status" colspan="2"/>
+                                <field name="categ_id" select="1"/>
+                                <field name="state" select="2"/>
+                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="uom">
+                                <separator string="UOM" colspan="2"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_po_id"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
+                                <separator string="Second UoM" colspan="2"/>
+                                <field name="uos_id"/>
+                                <field name="uos_coeff"/>
+                                <field name="mes_type"/>
+                            </group>
+
                         </page>
-                        <page string="Procurement">
-                            <field name="supply_method" select="2"/>
-                            <field name="rental" select="2"/>
+                        <page string="Procurement &amp; Locations">
+                            <group colspan="2" col="2" name="delay">
+                                <separator string="Delays" colspan="2"/>
+                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="produce_delay"/>
+                                <field name="warranty"/>
+                            </group>
+                            <group colspan="2" col="2" name="store">
+                                <separator string="Storage Localisation" colspan="2"/>
+                                <field name="loc_rack"/>
+                                <field name="loc_row"/>
+                                <field name="loc_case"/>
+                            </group>
+
+                            <group colspan="2" col="2" name="misc">
+                                <separator string="Miscelleanous" colspan="2"/>
+                            </group>
+
+                        </page>
+                        <page string="Prices &amp; Suppliers">
+                            <separator string="Base Prices" colspan="4"/>
+                            <field name="standard_price"/>
+                            <field name="list_price"/>
+                            <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field name="sale_delay" select="2"/>
-                            <field name="sale_ok" select="2"/>
-                            <field name="purchase_ok" select="2"/>
-                            <field name="produce_delay" select="2"/>
-                            <field name="warranty"/>
+                            <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
+                            <separator string="Description"/>
+                            <field colspan="4" name="description" nolabel="1"/>
                             <separator string="Sale Description"/>
                             <field colspan="4" name="description_sale" nolabel="1"/>
                             <separator string="Purchase Description"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 52a84c6cfa7..d362ad6d664 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -108,7 +108,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id"/>
-                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id}"/>
+                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
                             <newline/>
                             <field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index d1cf0f7a3ad..c82391a2df2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -27,14 +27,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <page string="Properties" position="inside">
-                    <separator string="Counter-Part Locations Properties" colspan="4"/>
-                    <field name="property_stock_procurement"/>
-                    <field name="property_stock_production"/>
-                    <field name="property_stock_inventory"/>
-                    <separator string="Accounting Entries" colspan="4"/>
-                    <field name="property_stock_account_input"/>
-                    <field name="property_stock_account_output"/>
+                 <page position="after" string="Information">
+                    <page string="Properties">
+                        <separator string="Counter-Part Locations Properties" colspan="4"/>
+                        <field name="property_stock_procurement"/>
+                        <field name="property_stock_production"/>
+                        <field name="property_stock_inventory"/>
+                        <separator string="Accounting Entries" colspan="4"/>
+                        <field name="property_stock_account_input"/>
+                        <field name="property_stock_account_output"/>
+                    </page>
                 </page>
             </field>
         </record>
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index ca2fdf011e3..559a1b68b49 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -14,7 +14,8 @@
     "demo_xml" : [],
     "update_xml" : [
         "wiki_view.xml",
-        #"wiki_data.xml",
+        "data/wiki_main.xml",
+        "data/wiki_quickstart.xml",
         "wizard/wizard_view.xml",
         "security/ir.model.access.csv"
     ],
diff --git a/addons/wiki/data/wiki_faq.xml b/addons/wiki/data/wiki_faq.xml
new file mode 100644
index 00000000000..12bbf745ce3
--- /dev/null
+++ b/addons/wiki/data/wiki_faq.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/wiki/data/wiki_help.xml b/addons/wiki/data/wiki_help.xml
new file mode 100644
index 00000000000..12bbf745ce3
--- /dev/null
+++ b/addons/wiki/data/wiki_help.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/wiki/data/wiki_quality.xml b/addons/wiki/data/wiki_quality.xml
new file mode 100644
index 00000000000..12bbf745ce3
--- /dev/null
+++ b/addons/wiki/data/wiki_quality.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/wiki/data/wiki_quickstart.xml b/addons/wiki/data/wiki_quickstart.xml
new file mode 100644
index 00000000000..23b35675078
--- /dev/null
+++ b/addons/wiki/data/wiki_quickstart.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record id="wiki_groups_help0" model="wiki.groups">
+			<field name="name">Help</field>
+			<field eval="1" name="section"/>
+		</record>
+	</data>
+	<data>
+		<record id="wiki_groups_wikiformatting0" model="wiki.groups">
+			<field name="name">Wiki Formatting</field>
+			<field name="parent_id" ref="wiki_groups_help0"/>
+			<field eval="1" name="section"/>
+		</record>
+	</data>
+	<data>
+		<record id="wiki_wiki_quickstart0" model="wiki.wiki">
+			<field name="name">Basic Wiki Editing</field>
+			<field name="tags">help, quick start, wiki, formatting</field>
+			<field name="minor_edit">0</field>
+			<field name="toc">1</field>
+			<field name="section">1.1</field>
+			<field name="summary">Initial Page</field>
+			<field  name="text_area">==Basic Wiki Editing==
+You can ''italicize text'' by putting 2 
+apostrophes on each side. 
+3 apostrophes will embolden '''the text'''. 
+5 apostrophes will embolden and italicize 
+'''''the text'''''.
+(4 apostrophes don't do anything
+special -- there's just ''''one left
+over''''.)
+
+You can ''italicize text'' by putting 2 
+apostrophes on each side. 
+
+3 apostrophes will embolden '''the text'''. 
+
+5 apostrophes will embolden and italicize 
+'''''the text'''''.
+
+(4 apostrophes don't do anything special -- there's just ''''one left over''''.)
+
+==Links==
+===Internal===
+You give the link as same as the wiki Page Title
+
+Go back to Main Page : [[The Open ERP wiki]]
+===External===
+You can give link to the other Web page over the Internet easily  [http://google.com Visit Google]
+==Attachments==
+===Images===
+You can get the External links easily
+
+img:http://images.google.co.in/intl/en_ALL/images/images_hp.gif
+
+==Play with Open ERP Records==
+* edit:res.partner|False|Create New Partner
+* edit:res.partner|China Export|Edit China Export
+* edit:res.country|India|Edit Country - India
+
+==Working with Attachments==
+* Download File : attach:document.doc
+
+==Unnumbered List==
+* ''Unordered lists'' are easy to do:
+** Start every line with a star.
+*** More stars indicate a deeper level.
+*: Previous item continues.
+** A new line
+* in a list  
+marks the end of the list.
+*Of course you can start again.
+
+==Numbered List==
+# ''Numbered lists'' are:
+## Very organized
+## Easy to follow
+#: Previous item continues
+A new line marks the end of the list.
+# New numbering starts with 1
+
+==Text Indents==
+: A colon (:) indents a line or paragraph.
+A newline starts a new paragraph.
+: We use 1 colon to indent once.
+:: We use 2 colons to indent twice.
+::: 3 colons to indent 3 times, and so on.
+
+==Table==
+&lt;nowiki&gt;
+{| border="1" cellspacing="0" cellpadding="5" align="left"
+! Web site
+! Link
+! Contact Email
+|- 
+| '''Open ERP''' - ''Belgium''
+| [http://openerp.com]
+| [[ mailto:fp@tinyerp.com ]]
+|}
+&lt;/nowiki&gt;
+
+{| border="1" cellspacing="0" cellpadding="5" align="left"
+! Web site
+! Link
+! Contact Email
+|- 
+| '''Open ERP''' - ''Belgium''
+| [http://openerp.com]
+| [[ mailto:fp@tinyerp.com ]]
+|}
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+&lt;br/&gt;
+==Headings==
+=1st Level Heading=
+==2nd Level Heading==
+===3rd Level Heading===
+</field>
+			<field name="group_id" ref="wiki_groups_wikiformatting0"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index c12ecb6c4ec..cb1680bcb9a 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -43,7 +43,7 @@ class WikiGroup(osv.osv):
        'notes':fields.text("Description", select=True),
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
-       'section': fields.boolean("Make Section?")
+       'section': fields.boolean("Make Section ?"),
     }
 WikiGroup()
 
@@ -64,6 +64,7 @@ class Wiki(osv.osv):
         'summary':fields.char('Summary',size=256, select=True),
         'section': fields.char('Section', size=32, help="Use page section code like 1.2.1"),
         'group_id':fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
+        'toc':fields.boolean('Table of Contents ?'),
     }
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
         if (not group_id) or content:
diff --git a/addons/wiki/wiki_data.xml b/addons/wiki/wiki_data.xml
deleted file mode 100644
index 8e3ce35339a..00000000000
--- a/addons/wiki/wiki_data.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-		<record id="wiki_groups_help0" model="wiki.groups">
-			<field eval="&quot;&quot;&quot;Help&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="section"/>
-		</record>
-	</data>
-	<data>
-		<record id="wiki_groups_wikiformatting0" model="wiki.groups">
-			<field eval="&quot;&quot;&quot;Wiki Formatting&quot;&quot;&quot;" name="name"/>
-			<field name="parent_id" ref="wiki_groups_help0"/>
-			<field eval="1" name="section"/>
-		</record>
-	</data>
-	<data>
-		<record id="wiki_wiki_quickstart0" model="wiki.wiki">
-			<field eval="&quot;&quot;&quot;Quick Start&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;help, quick start, wiki, formatting&quot;&quot;&quot;" name="tags"/>
-			<field eval="0" name="minor_edit"/>
-			<field eval="&quot;&quot;&quot;1&quot;&quot;&quot;" name="section"/>
-			<field eval="&quot;&quot;&quot;quick start help for the wiki formating&quot;&quot;&quot;" name="summary"/>
-			<field  name="text_area">
-			<![CDATA[
-			==Basic Fromatting==
-			 You can ''italicize text'' by putting 2 
-			 apostrophes on each side. 
-			 3 apostrophes will embolden '''the text'''. 
-			 5 apostrophes will embolden and italicize 
-			 '''''the text'''''.
-			 (4 apostrophes don't do anything
-			 special -- there's just ''''one left
-			 over''''.)
-			
-			You can ''italicize text'' by putting 2 
-			apostrophes on each side. 
-			
-			3 apostrophes will embolden '''the text'''. 
-			
-			5 apostrophes will embolden and italicize 
-			'''''the text'''''.
-			
-			(4 apostrophes don't do anything special -- there's just ''''one left over''''.)
-			
-			==Links==
-			===Internal===
-			You give the link as same as the wiki Page Title
-			<br/>
-			See also : [[Complete Help]]
-			===External===
-			You can give link to the other Web page over the Internet easily  [http://google.com Visit Google]
-			==Attachments==
-			===Images===
-			You can get the External links easily <br/>
-			img:http://images.google.co.in/intl/en_ALL/images/images_hp.gif
-			
-			==Headings==
-			 =1st Level Heading=
-			 ==2nd Level Heading==
-			 ===3rd Level Heading===
-			
-			==Unnumbered List==
-			* ''Unordered lists'' are easy to do:
-			** Start every line with a star.
-			*** More stars indicate a deeper level.
-			*: Previous item continues.
-			** A new line
-			* in a list  
-			marks the end of the list.
-			*Of course you can start again.
-			
-			==Numbered List==
-			# ''Numbered lists'' are:
-			## Very organized
-			## Easy to follow
-			#: Previous item continues
-			A new line marks the end of the list.
-			# New numbering starts with 1
-			
-			==Text Indents==
-			: A colon (:) indents a line or paragraph.
-			A newline starts a new paragraph.
-			: We use 1 colon to indent once.
-			:: We use 2 colons to indent twice.
-			::: 3 colons to indent 3 times, and so on.
-			
-			==Table==
-			<nowiki>
-			 {| border="1" cellspacing="0" cellpadding="5" align="left"
-			 ! Web site
-			 ! Link
-			 ! Contact Email
-			 |- 
-			 | '''Open ERP''' - ''Belgium''
-			 | [http://openerp.com]
-			 | [[ mailto:fp@tinyerp.com ]]
-			 |}
-			</nowiki>
-			{| border="1" cellspacing="0" cellpadding="5" align="left"
-			 ! Web site
-			! Link
-			! Contact Email
-			|- 
-			| '''Open ERP''' - ''Belgium''
-			| [http://openerp.com]
-			| [[ mailto:fp@tinyerp.com ]]
-			|}
-			<br/><br/>]]></field>
-			<field name="group_id" ref="wiki_groups_wikiformatting0"/>
-		</record>
-	</data>
-</openerp>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 9d8f63cfcd0..75654567e5a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -100,6 +100,7 @@
                         <field name="write_uid" readonly="1" select="2"/>
                         <field name="tags" select="2" groups="base.group_extended"/>
                         <field name="minor_edit" select="2" groups="base.group_extended"/>
+                        <field name="toc"/>
                         <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
@@ -129,7 +130,7 @@
                 <tree srting="Wiki History">
                     <field name="create_date"/>
                     <field name="write_uid"/>
-                    <field name="minor_edit"/>
+                    <field name="minor_edit" groups="base.group_extended"/>
                     <field name="summary"/>
                 </tree>
             </field>
@@ -143,9 +144,9 @@
                 <form srting="Wiki History">
                     <field name="wiki_id" select="1" colspan="4"/>
                     <field name="summary" select="1" colspan="4"/>
-                    <field name="text_area" select="1" colspan="4" widget="text_wiki"/>
+                    <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
                     <field name="create_date" select="1"/>
-                    <field name="minor_edit" select="1"/>
+                    <field name="minor_edit" select="1" groups="base.group_extended"/>
                 </form>
             </field>
         </record>
@@ -168,7 +169,7 @@
             src_model="wiki.wiki"/>
 
         <act_window
-            domain="[('group_id', '=', active_id)]"
+            domain="[('group_id', 'child_of', active_ids)]"
             id="act_wiki_group_open"
             name="Wiki Pages"
             res_model="wiki.wiki"