diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 892747c849f..accdf95d929 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1020,7 +1020,7 @@ class account_move_line(osv.osv):
         }
 
         document = etree.Element('tree', string=title, editable="top",
-                                 refresh="5", on_write="on_create_write",
+                                 on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
         fields_get = self.fields_get(cr, uid, flds, context)
         for field, _seq in fld:
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cd1860b6d98..73bf64893ba 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -9,19 +9,16 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Accounting">
-                    <group name="properties">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
-                    <newline/>
-                    <group colspan="2">
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <separator string="Purchase Taxes" colspan="2"/>
-                        <field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
+                        <group name="properties">
+                            <group>
+                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                            <group>
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
+                                <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 7477f163b95..7dd9b13b4d3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -6,7 +6,6 @@
         Analytic Account form
         -->
 
-
         <act_window
             id="action_sales_order_line"
             name="Sales Order Lines"
@@ -14,7 +13,7 @@
             src_model="account.analytic.account"
             />
             
-        <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
+        <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 74dce06b85a..8a79d96d1c4 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after">
+                <xpath expr="//field[@name='property_account_expense']" position="after">
                     <label string="" colspan="2"/>
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index 758466160c1..abc33dc596f 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-08 01:54+0000\n"
+"PO-Revision-Date: 2012-06-13 17:16+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
+"X-Generator: Launchpad (build 15405)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -169,7 +169,7 @@ msgstr "会社"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr "承認のため"
+msgstr "承認"
 
 #. module: account_budget
 #: view:crossovered.budget:0
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index dba40940166..b0a81461334 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -90,15 +90,32 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <div class="oe_form_title">
+                        <label for="number" class="oe_form_readonly_hidden"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                            <field name="name" colspan="2"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="account_id"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                  domain="[('type','=','liquidity')]"/>
+                            <field name="reference"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                            />
+                            <field name="paid" invisible="1"/>
+                        </group>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
@@ -111,26 +128,21 @@
                                 </tree>
                             </field>
                             <group col="3">
-                                <group string="Internal Notes" col="1">
-                                    <field name="narration"/>
+                                <group colspan="1">
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
-                                <group col="2">
-                                    <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                                    <field name="account_id"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                          domain="[('type','=','liquidity')]"/>
-                                         <!-- should select income accounts only. Or use the journal for this ? -->
-                                    <field name="reference"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                    />
-                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                                    <field name="paid" invisible="1"/>
-                                </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
+                                <group>
+                                    <group class="oe_form_subtotal_footer" string="Total">
+                                        <field name="tax_id" 
+                                            on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                            widget="selection"
+                                            domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <field name="tax_amount" nolabel="1"/>
+                                        <field name="amount" class="oe_form_subtotal_footer_separator" />
+                                        <button type="object"
+                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>                                    
                                 </group>
                             </group>
                         </page>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fa073938a37..5c83337044c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -28,37 +28,40 @@
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="email" string="Invitation To"/>
-                            <field name="cutype" string="Invitation Type" />
-                            <field name="rsvp" />
-                            <field name="role" string="Role" />
-                            <field name="sent_by_uid" string="Invitation From" />
+
+                        <div class="oe_form_title">
+                            <label for="email" string="Invitation To" class="oe_form_readonly_hidden" /> 
+                            <h1>
+                                <field name="email" class="oe_form_inline" />
+                                (<field name="language" class="oe_form_inline" />)
+                            </h1>
+                            
+                            <h2>
+                                From <field name="event_date" class="oe_form_inline" />
+                                to <field name="event_end_date" class="oe_form_inline"/>
+                            </h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="sent_by_uid" string="Invitation From" />
+                                <field name="user_id" string="Invited User"/>
+                                <field name="partner_id" string="Contact" />
+                            </group>
+                            <group>
+                                <field name="cutype" string="Invitation Type" />
+                                <field name="role" string="Role" />
+                                <field name="rsvp" />
+                                <field name="ref" readonly="1"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Delegrated From">
+                                <field name="parent_ids" readonly="1" nolabel="1" />
+                            </group>
+                            <group string="Delegrated To" >
+                                <field name="child_ids" readonly="1" nolabel="1" />
+                            </group>
                         </group>
-                        <notebook>
-                            <page string="Invitation">
-                                <group>
-                                    <group string="Invitation Detail">
-                                        <field name="user_id" string="Invited User"/>
-                                        <field name="partner_id" string="Contact" />
-                                    </group>
-                                    <group string="Event Detail">
-                                        <field name="event_date" />
-                                        <field name="event_end_date" />
-                                        <field name="language"/>
-                                        <field name="ref" readonly="1"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Delegation Info">
-                                <separator string="Delegated From" colspan="4" />
-                                <field name="parent_ids"
-                                    readonly="1" />
-                                <separator string="Delegated To" colspan="4" />
-                                <field name="child_ids"
-                                    readonly="1" />
-                            </page>
-                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 02fc3369041..fd3a398845d 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -40,27 +40,6 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
 
-    <act_window
-            id="act_crm_opportunity_crm_phonecall_new"
-            name="Phone calls"
-            groups="base.group_sale_salesman"
-            res_model="crm.phonecall"
-            src_model="crm.lead"
-            view_mode="tree,calendar,form"
-            context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
-    <act_window
-            id="act_crm_opportunity_crm_meeting_new"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="crm.lead"
-            view_mode="tree,form,calendar"
-            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 86a891aae45..d75df3384e3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,6 +53,25 @@
         <!--
             LEADS
             -->
+        <act_window
+                id="act_crm_opportunity_crm_phonecall_new"
+                name="Phone calls"
+                groups="base.group_sale_salesman"
+                res_model="crm.phonecall"
+                view_mode="tree,calendar,form"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
+        <act_window
+                id="act_crm_opportunity_crm_meeting_new"
+                name="Meetings"
+                res_model="crm.meeting"
+                view_mode="tree,form,calendar"
+                context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -74,6 +93,16 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_form_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_meeting_new)d"
+                            string="Meetings" />
+
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_phonecall_new)d"
+                            string="Phone Calls" />
+                    </div>
+
                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <group>
@@ -220,10 +249,9 @@
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
-                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
+                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                 <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                 <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
@@ -363,6 +391,10 @@
         <field name="arch" type="xml">
             <form string="Opportunities" version="7.0">
                 <header>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
                     <button name="case_open" string="Open" type="object"
@@ -375,10 +407,6 @@
                             states="done,cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7c0b2f6cfa4..5f94e3d738f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
     <act_window
         id="crm_case_categ_meet_create_partner"
         name="Schedule a Meeting"
         res_model="crm.meeting"
-        src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
         domain="[('partner_id', '=', active_id)]"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e98ce2ce8f6..9123cf7c305 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,52 +38,62 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                <group col="6" colspan="4">
-                    <field name="name" string="Title"
-                           required="1" />
-                    <field name="categ_id" widget="selection"
-                        string="Meeting Type"
-                        domain="[('object_id.model', '=', 'crm.meeting')]" />
-                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
-                    <newline/>
-                    <field name="date" string="Start Date" required="1"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="date_deadline" string="End Date" required="1"
-                        on_change="onchange_dates(date,False,date_deadline)" />
-                    <field name="location" />
-                    <field name="alarm_id" string="Reminder"
-                        widget="selection" />
-                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" string="Recurrence"/>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="name" string="Title"/> 
+                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
+                            <label for="allday" string="All Day?"/>)
+                        </div>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <h2>
+                            At <field name="location" class="oe_form_inline" />
+                        </h2>
+                    </div>
+                    <h2>
+                        <label for="duration" string="Duration" />
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)"
+                            class="oe_form_inline"/> from
+                        <field name="date"
+                            string="Start Date" 
+                            required="1"
+                            class="oe_form_readonly_hidden oe_form_inline"/> to
+                        <field name="date_deadline" 
+                            string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)"                            
+                            class="oe_form_inline"/> 
+                    </h2>
+                <group colspan="4" col="4">
+                    <group colspan="2">
+                        <field name="user_id" />
+                        <field name="organizer"/>
+                        <field name="section_id" widget="selection"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="alarm_id" string="Reminder" widget="selection" />
+                        <field name="class" string="Privacy"/>
+                        <field name="show_as" string="Show Time as"/>
+                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="partner_id" string="Partner"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="email_from"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="categ_id" widget="selection"
+                            string="Meeting Type"
+                            domain="[('object_id.model', '=', 'crm.meeting')]" />
+                        <field name="rrule" invisible="1" readonly="1"/>
+                        <field name="recurrent_id" invisible="1"/>
+                        <field name="recurrent_uid" invisible="1"/>
                     </group>
                 </group>
+                <separator string="Description" colspan="4" />
+                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
-                <page string="Meeting">
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Assignment"/>
-                            <field name="user_id" />
-                            <field name="organizer"/>
-                            <field name="section_id" widget="selection"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
-                            <field name="partner_id" string="Partner"
-                                on_change="onchange_partner_id(partner_id)" />
-                            <field name="email_from"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
-                            <field name="show_as" string="Show Time as"/>
-                            <field name="rrule" invisible="1" readonly="1"/>
-                            <field name="recurrent_id" invisible="1"/>
-                            <field name="recurrent_uid" invisible="1"/>
-                        </group>
-                    </group>
-                    <separator string="Description" colspan="4" />
-                    <field name="description" nolabel="1" colspan="4" />
-                    </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@@ -157,12 +167,11 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string=" Recurrence Pattern" />
                                 <field name="interval" />
-                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
@@ -209,9 +218,9 @@
                     </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>
@@ -296,7 +305,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
                 <field name="arch" type="xml">
-                    <field name="language" position="after">
+                    <field name="ref" position="after">
                         <field name="categ_id" string="Event Type"/>
                     </field>
                 </field>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c6fc9b404a4..b4e65d9aa0a 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -6,7 +6,6 @@
         id="crm_case_categ_phone_create_partner"
         name="Schedule a Call"
         res_model="crm.phonecall"
-        src_model="res.partner"
         view_mode="calendar,tree,form"
         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
         groups="base.group_sale_salesman"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b5c75aa6ccf..04ab8645215 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,50 +65,48 @@
             <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending" icon="gtk-go-forward"/>
+                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object"
-                        states="open,pending" icon="gtk-jump-to"/>
+                        states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel" icon="gtk-convert"/>
+                        states="cancel"/>
                 <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending" icon="gtk-cancel"/>
+                        states="draft,open,pending"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    icon="gtk-index" type="action"
+                    type="action"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Schedule Other Call"
-                    icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
+                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
+                  <div class="oe_form_title">
+                      <div class="oe_form_readonly_hidden">
+                          <label for="name" string="Title"/> 
+                      </div>
+                      <h1><field name="name" required="1"/></h1>
+                      <div class="oe_form_readonly_hidden">
+                        <label for="partner_phone" string="Phone" />
+                      </div>
+                      <h2><field name="partner_phone"/></h2>
+                  </div>
                  <group col="4">
-                    <field name="name" required="1"/>
-                    <field name="partner_phone"/>
-                    <field name="duration" widget="float_time"/>
-
-                    <field name="date"/>
-                    <field name="user_id"/>
+                    <field name="date" />
+                    <field name="user_id" />
+                    <field name="duration" widget="float_time" />
                     <field name="section_id" colspan="1" widget="selection" />
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                    <field name="categ_id" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="partner_mobile" />
+                    <field name="priority"/>
+                    <field name="opportunity_id"/>
                 </group>
 
-                <group>
-                    <group string="Contacts">
-                        <field name="partner_id"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="partner_mobile"/>
-                    </group>
-                    <group string="Categorization">
-                        <field name="categ_id" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="priority"/>
-                        <field name="opportunity_id"/>
-                    </group>
-                </group>
-                <separator string="Description"/>
-                <field name="description"/>
+                <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
                 <field name="message_ids" widget="ThreadView"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b9da39c4721..257d1cd93f7 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -158,13 +158,13 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
+                        <field name="state" string="Related State" />
                         <field name="probability"/>
-                        <field name="on_change"/>
-                        <field name="case_default"/>
-                        <field name="sequence"/>
-                        <field name="state"/>
-                        <field name="fold"/>
                         <field name="type"/>
+                        <field name="on_change"/>
+                        <field name="sequence"/>
+                        <field name="case_default"/>
+                        <field name="fold"/>
                     </group>
                     <separator string="Requirements"/>
                     <field name="requirements" nolabel="1"/>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 78a956f65ac..8ca4e4755ee 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -82,6 +82,27 @@
             </field>
         </record>
 
+
+        <record model="ir.ui.view" id="res_partner_view_buttons">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action"
+                        string="Schedule a Meeting"
+                        name="%(crm.crm_case_categ_meet_create_partner)d"
+                        context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
+                    <button type="action" string="Schedule a Call" 
+                        name="%(crm.crm_case_categ_phone_create_partner)d" 
+                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
+                    <button type="action" string="Create an Opportunity"
+                        name="%(crm.action_view_crm_partner2opportunity)d" />
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index b91b31d7721..ad1a763fa46 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,29 +10,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual" version="7.0">
-                <header>
-                    <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                    <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                    <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                </header>
-                <group>
+                    <header>
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </header>
                     <group>
-                        <field name="action"/>
-                        <field name="name"/>
-                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        <group>
+                            <field name="action"/>
+                            <field name="name"/>
+                            <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
+                        <group>
+                            <field name="partner_id" readonly="True"/>
+                            <field name="categ_id" string="Type"
+                                widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"
+                            groups="base.group_no_one"/>
+                            <field name="phone"/>
+                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
                     </group>
-                    <group>
-                        <field name="partner_id" readonly="True"/>
-                        <field name="categ_id" string="Type"
-                            widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        groups="base.group_no_one"/>
-                        <field name="phone"/>
-                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    </group>
-                </group>
-                <field name="note"/>
+                    <field name="note" placeholder="Call Description" />
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index a65aa4ae5e0..c7641d8f64d 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -42,5 +42,4 @@
             view_mode="form" target="new" view_type="form"
             groups="base.group_sale_salesman"/>
      </data>
-
 </openerp>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 099754aef06..fb1587b543c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -230,12 +230,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id" position="after">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
@@ -245,12 +243,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/google_base_account/i18n/sl.po b/addons/google_base_account/i18n/sl.po
new file mode 100644
index 00000000000..7cbfb60a9c7
--- /dev/null
+++ b/addons/google_base_account/i18n/sl.po
@@ -0,0 +1,119 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-13 22:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
+"X-Generator: Launchpad (build 15405)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr ""
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr ""
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr ""
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index af276f48440..0a9860dc979 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,8 +9,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <field name="message_ids" widget="ThreadView" nolabel="1"
+                    <footer>
+                    <field name="message_ids" widget="ThreadView" 
                             options='{"thread_level": 1}'/>
+                    </footer>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index b598b050410..d311d6a2da4 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-06-14 05:53+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
+"X-Generator: Launchpad (build 15414)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "sub products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
@@ -54,7 +54,7 @@ msgstr "部件不应该是成品本身"
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "Sub Products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -89,7 +89,7 @@ msgstr "编号必须在公司内唯一！"
 #. module: mrp_subproduct
 #: field:mrp.bom,sub_products:0
 msgid "sub_products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d94ac882cda..c9a6d55c9d4 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -207,33 +207,34 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reordering Rules" version="7.0">
-                    <group col="2" colspan="2">
-                        <separator string="General Information" colspan="2" />
-                        <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="product_uom"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Locations" colspan="2" />
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Quantity Rules" colspan="2" />
-                        <field name="product_min_qty"/>
-                        <field name="product_max_qty"/>
-                        <field name="qty_multiple"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2" />
-                        <field name="procurement_id" readonly="1"/>
-                        <field name="active" />
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string="Procurement Orders to Process" colspan="4" />
-                        <field name="procurement_draft_ids" colspan="4" nolabel="1"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            </group>
+                            <group>
+                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                                <field name="product_uom"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Rules">
+                                <field name="product_min_qty" />
+                                <field name="product_max_qty" />
+                                <field name="qty_multiple" string="Quantity Multiple"/>
+                            </group>
+                            <group string="Misc">
+                                <field name="procurement_id" readonly="1"/>
+                                <field name="active" />
+                            </group>
+                        </group>
+                        <group string="Procurement Orders to Process">
+                            <field name="procurement_draft_ids" nolabel="1"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c2b6663bdb0..a479e9a72e1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -69,118 +69,124 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product" layout="auto" version="7.0">
-                    <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
-                    <label for="name" class="oe_form_readonly_hidden"/>
-                    <h1><field name="name"/></h1>
-                    <label for="categ_id" class="oe_form_readonly_hidden"/>
-                    <h2><field name="categ_id"/></h2>
+                    <sheet>
+                        <field name="product_image" widget="image" class="oe_form_avatar oe_right" />
 
-                    <notebook>
-                        <page string="Information">
-                            <group>
+                        <div class="oe_form_title">
+                            <div class="oe_form_readonly_hidden">
+                                <label for="name" string="Product Name" /> 
+                            </div>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                            <label for="categ_id" class="oe_form_readonly_hidden" />
+                            <h2><field name="categ_id" /></h2>
+                        </div>
+                        <notebook>
+                            <page string="Information">
                                 <group>
-                                    <field name="default_code"/>
-                                    <field name="ean13" placeholder="5901234123457" />
-                                    <field groups="product.group_product_variant" name="variants" />
-                                </group>
-                                <group>
-                                    <field name="sale_ok"/>
-                                    <field name="purchase_ok"/>
-                                </group>
-                                <group string="Procurement">
-                                    <field name="type"/>
-                                    <field name="procure_method"/>
-                                    <field name="supply_method"/>
-                                </group>
-                                <group string="Base Prices">
-                                    <field name="list_price"/>
-                                    <field name="cost_method"/>
-                                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                                    <field name="price_margin" groups="product.group_product_variant"/>
-                                    <field name="price_extra" groups="product.group_product_variant"/>
-                                </group>
-
-                                <group groups="product.group_stock_packaging" string="Weights">
-                                    <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
-
-                                <group name="status" string="Status">
-                                    <field name="state"/>
-                                    <field name="product_manager"/>
-                                </group>
-
-                                <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                    <field name="uom_po_id"/>
-                                </group>
-
-                                <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
-                                    <field name="uos_id"/>
-                                    <field name="uos_coeff"/>
-                                    <field name="mes_type"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Procurement &amp; Locations">
-                            <group>
-                                <group name="delay" string="Delays">
-                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                    <field name="warranty"/>
-                                </group>
-                                <group name="store" string="Storage Localisation">
-                                    <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
-                                    <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
-                                <group name="misc" string="Miscellaneous">
-                                    <field name="active"/>
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                            </group>
-
-                        </page>
-                        <page string="Suppliers">
-                            <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                        </page>
-                        <page string="Descriptions">
-                            <separator string="Description"/>
-                            <field name="description"/>
-                            <separator string="Sale Description"/>
-                            <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                            <separator string="Purchase Description"/>
-                            <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                        </page>
-                        <page groups="product.group_stock_packaging" string="Packaging">
-                            <field name="packaging">
-                                <form string="Packaging" version="7.0">
-                                    <group col="4">
-                                        <field name="ean"/>
-                                        <field name="sequence" invisible="1"/>
-                                        <newline/>
-                                        <field name="qty"/>
-                                        <field name="ul"/>
-                                        <field name="weight_ul"/>
-                                        <separator colspan="4" string="Palletization"/>
-                                        <field name="ul_qty"/>
-                                        <field name="rows"/>
-                                        <field name="weight"/>
-                                        <separator colspan="4" string="Pallet Dimension"/>
-                                        <field name="height"/>
-                                        <field name="width"/>
-                                        <field name="length"/>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <field name="ean13" placeholder="5901234123457" />
+                                        <field groups="product.group_product_variant" name="variants" />
                                     </group>
-                                    <separator colspan="4" string="Description"/>
-                                    <field name="name"/>
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
+                                    <group>
+                                        <field name="sale_ok"/>
+                                        <field name="purchase_ok"/>
+                                    </group>
+                                    <group string="Procurement">
+                                        <field name="type"/>
+                                        <field name="procure_method"/>
+                                        <field name="supply_method"/>
+                                    </group>
+                                    <group string="Prices">
+                                        <field name="list_price"/>
+                                        <field name="cost_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                        <field name="price_margin" groups="product.group_product_variant"/>
+                                        <field name="price_extra" groups="product.group_product_variant"/>
+                                    </group>
+
+                                    <group groups="product.group_stock_packaging" string="Weights">
+                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+
+                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                        <field name="uom_po_id"/>
+                                        <field name="uos_id"/>
+                                        <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
+                                    </group>
+
+                                    <group name="status" string="Status">
+                                        <field name="state"/>
+                                        <field name="product_manager"/>
+                                    </group>
+
+                                </group>
+                            </page>
+                            <page string="Procurement &amp; Locations">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+
+                            </page>
+                            <page string="Suppliers">
+                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                            </page>
+                            <page string="Descriptions">
+                                <separator string="Description"/>
+                                <field name="description"/>
+                                <separator string="Sale Description"/>
+                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
+                                <separator string="Purchase Description"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page groups="product.group_stock_packaging" string="Packaging">
+                                <field name="packaging">
+                                    <form string="Packaging" version="7.0">
+                                        <group col="4">
+                                            <field name="ean"/>
+                                            <field name="sequence" invisible="1"/>
+                                            <newline/>
+                                            <field name="qty"/>
+                                            <field name="ul"/>
+                                            <field name="weight_ul"/>
+                                            <separator colspan="4" string="Palletization"/>
+                                            <field name="ul_qty"/>
+                                            <field name="rows"/>
+                                            <field name="weight"/>
+                                            <separator colspan="4" string="Pallet Dimension"/>
+                                            <field name="height"/>
+                                            <field name="width"/>
+                                            <field name="length"/>
+                                        </group>
+                                        <separator colspan="4" string="Description"/>
+                                        <field name="name"/>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 13c4b7d6283..f30ba027040 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -363,18 +363,18 @@
                     </h2>
                     <group>
                         <group>
+                            <field name="effective_hours"
+                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="partner_id" />
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                 groups="project.group_time_work_estimation_tasks"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
 
-                            <field name="effective_hours"
-                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <label for="remaining_hours" string="+ Remaining"/>
                             <div>
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
@@ -387,8 +387,9 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Information">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}"/>
+                        <page string="Description">
+                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." />
+                            <separator string="Task Works" />
                             <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
@@ -421,8 +422,6 @@
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="notes"/>
                         </page>
                     </notebook>
                     </sheet>
@@ -721,16 +720,15 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="state"/>
+                            <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="case_default"/>
+                            <field name="state" string="Related State"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
                     </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..."/>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index caa5c1923bc..306d89ae89f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -84,13 +84,8 @@
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                            <label for="task_id"/>
-                            <div>
-                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
-                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
-                                    attrs="{'invisible':[('task_id','!=',False)]}" />
-                            </div>
                         </group><group>
+                            <field name="task_id" on_change="onchange_task_id(task_id)" />
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
@@ -98,7 +93,7 @@
                             <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..." />
 
                     <notebook groups="base.group_no_one">
                         <page string="Extra Info">
@@ -258,7 +253,6 @@
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
                                         <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
                                         <a string="Escalate" name="case_escalate"  icon="gtk-go-up" type="object"/>
                                         <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 32d2113727b..93417cf2ac8 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -29,9 +29,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-            <xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
-                <field name="sale_line_id"/>
-            </xpath>
+                <field name="state" position="after">
+                    <field name="sale_line_id" string="Order Line"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index d92e63082bb..d1a48e7f556 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-12 06:34+0000\n"
+"PO-Revision-Date: 2012-06-14 05:06+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-13 04:55+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
+"X-Generator: Launchpad (build 15414)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
-msgstr "買い手は仕入先に送られる前に見積（RFQ）を承認しなければなりません。見積（RFQ）は確認された発注オーダーになります。"
+msgstr "買い手は仕入先に送られる前に見積依頼（RFQ）を承認しなければなりません。見積依頼（RFQ）は確認された発注オーダーになります。"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -75,7 +75,7 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
-"仕入先に対して製品を購入したいが、しかし、まだ発注を確認していない場合に見積要求を作成できます。このメニューは物流ルール（最小在庫、MTOなど）を基本とし"
+"仕入先に対して製品を購入したいが、しかし、まだ発注を確認していない場合に見積依頼を作成できます。このメニューは物流ルール（最小在庫、MTOなど）を基本とし"
 "て自動的に作成された見積要求をレビューするためにも使用されます。オーダーが確認されると、見積要求から発注オーダーに変換することができます。拡張インタフェー"
 "ス（ユーザ設定から）を使用すると、仕入先請求書を制御する方法を選択できます：オーダー基準、受領基準、または手動エンコード。"
 
@@ -148,7 +148,7 @@ msgstr ""
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr "見積要求"
+msgstr "見積依頼"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
@@ -193,96 +193,96 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
-msgstr ""
+msgstr "仕入先から直接顧客に配達することを望む場合は住所を入れます。このケースでは、倉庫へのリンクは削除され、顧客の場所がセットされます。"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
 msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
-msgstr ""
+msgstr "この価格リストは、現在のパートナからの発注のためにデフォルトの価格リストの代わりに使用されます。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "FAX ："
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "仕入属性"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "部分集荷処理ウィザード"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "発注の承認"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "生成されたドラフト請求書に基づく"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "日順"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "分類別月間発注"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "発注"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "ドラフト状態の発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr ""
+msgstr "起点"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,notes:0
 #: view:purchase.order.line:0 field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
 #: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "税金"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -292,64 +292,64 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: field:purchase.order,name:0 view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 msgid "Products"
-msgstr ""
+msgstr "製品"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "月別合計数量と金額"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
+msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル済"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "発注オーダーに変換"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "輸送例外"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "請求書行"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -365,49 +365,49 @@ msgstr "出て行く製品"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "手動で修正"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "参照"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
-msgstr ""
+msgstr "最初に、この発注オーダーに関連する全請求書をキャンセルすべきです。"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "宛先住所の宛名"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA ："
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "発注オーダー %s はドラフト状態に設定されています。"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析アカウント"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "行数"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -415,97 +415,97 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: purchase
 #: field:purchase.order,validator:0 view:purchase.report:0
 msgid "Validated by"
-msgstr ""
+msgstr "検証者"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "先月のオーダー"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "最初に、この発注オーダーに関連する全ての受領をキャンセルすべきです。"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Price"
-msgstr ""
+msgstr "正価"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "それは集荷は行われたことを示しています。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "発注オーダーは例外状態です。"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
+msgstr "検証者"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 #: selection:purchase.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認済"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均価格"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "内部出荷は処理済です。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
 #: view:purchase.order.line_invoice:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "受領基準"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "仕入先参照"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -513,7 +513,7 @@ msgid ""
 "A Pick list generates a supplier invoice. Depending on the Invoicing control "
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
-msgstr ""
+msgstr "集荷リストは仕入先請求書を生成します。発注オーダーの請求書制御に応じて、請求書は受領基準あるいは注文数量基準となります。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -524,85 +524,87 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"発注オーダーで発注オーダー行基準として請求書制御をセットした場合、ここから、まだ仕入先請求書を受領していないもののために全ての発注オーダー行を追跡できます"
+"。仕入先請求書を受領するための準備ができたら、このメニューから行基準のドラフト仕入先請求書を生成できます。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "発注オーダーは例外状態です。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
 msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
-msgstr ""
+msgstr "受領分析はチェックの簡易化のため、会社のオーダー受領と仕入先の配達の実績の分析を行うことができます。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "TEL："
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr ""
+msgstr "集荷リスト"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "発注オーダーの集約"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
 #, python-format
 msgid "No Partner!"
-msgstr ""
+msgstr "パートナが指定されていません。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "FAX："
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "合計価格"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "仕入先の作成またはインポート"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "利用可能"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "住所宛名"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "送付先："
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "発注オーダーの請求書生成"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
@@ -610,12 +612,12 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_line_invoice.py:111
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
@@ -624,12 +626,14 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"発注フォームからパートナを選択する必要があります。\n"
+"製品を選択する前にひとつのパートナをセットして下さい。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:349
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この会社のために定義された発注仕訳帳がありません：%s (id:%d)"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -638,11 +642,12 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"発注オーダーの請求書制御が集荷時の時には、請求書は自動的に作成されます。請求書は会計士によって、手動で作成することもできます（請求書制御を手動にする）。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "発注オーダー確認番号"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -651,82 +656,83 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"発注分析はチェックの簡易化と会社の発注履歴と実績の分析が可能です、このメニューから交渉の実績や仕入先の配信実績などを追跡することができます。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "その他"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "選択仕入先は%s によりこの製品のみを売ります。"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "参照単位"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0 view:purchase.report:0
 #: field:purchase.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "予約宛先"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "会計ポジション"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "設定"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "受領"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "行を持たない発注オーダーは確認できません。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -736,276 +742,278 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"このメニューは仕入先から受け取る請求書の制御に使用します。OpenERPは設定に応じて発注オーダーまたは受領からドラフト請求書を事前に生成します。仕入先請"
+"求書を受け取ったなら、ドラフト請求書と突き合せて検証できます。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDIの価格リスト（%s）"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "承認待ち"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "発注オーダーの自動Eメール確認"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: report:purchase.order:0 view:purchase.order:0
 #: field:purchase.order,date_order:0 field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0 view:stock.picking:0
 msgid "Order Date"
-msgstr ""
+msgstr "オーダー日"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "この製品に製造ロットを割り当てる必要があります。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0 view:stock.picking:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "ドラフト請求書"
 
 #. module: purchase
 #: report:purchase.order:0 report:purchase.quotation:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
 msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
-msgstr ""
+msgstr "これは、全発注オーダー行の製品のもっとも小さい予定日として計算されます。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "発注オーダーの集約"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "今月のオーダー"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "配達日数"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "製品の受領"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "調達"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "請求書"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: purchase
 #: field:purchase.config.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "画像"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "ユーザの月別合計オーダー行"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "承認済発注オーダー"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "見積依頼："
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "承認待ち発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "税抜合計"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: purchase
 #: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "受信済"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "オーダー製品のリスト"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "これはこの発注のために生成された集荷リストです。"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "会計士によってレビューされます。"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税金："
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "請求済"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "発注オーダーの状態"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "宛先住所"
 
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "オーダー状態"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "製品分類"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "発注オーダー基準のドラフト請求書の事前作成"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0 field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "発注オーダー行"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "カレンダービュー"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "発注オーダー行基準"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "選択した単位は製品単位と同じ分類に属していません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "発注オーダー：%s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1014,16 +1022,17 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"発注オーダーは購入者により確認されるとすぐに仕入先請求書を生成します。発注オーダーの請求書制御に応じて、請求書は受領基準あるいは注文数量基準となります。"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "非課税金額"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "これは請求書は既に支払われたことを意味しています。"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
@@ -1033,27 +1042,27 @@ msgstr "請求するための出て行く製品"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "違う製品のロットを割り当てることはできません。"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "このドキュメントの作成日"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "受注と発注"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1062,54 +1071,55 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"発注オーダーの請求書制御がオーダー時である場合は、請求書は自動的に作成されます。請求書は会計士により、手動で生成することもできます（請求書制御を手動）。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Eメールテンプレート"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "手動作成請求書"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "単位の分類"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "発注の請求書制御"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "リストビューで集約する複数のオーダーを選択して下さい。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1118,52 +1128,53 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"このフォームから仕入先と彼らの連絡先を作成またはインポートするか、インポートデータウィザードからCSVの表計算より既存パートナをインポートできます。"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "生成された集荷リスト"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "例外"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Compute"
-msgstr ""
+msgstr "計算"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "内部出荷可能"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "アドレス帳"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "会社"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "発注オーダーのキャンセル"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "この発注オーダーはキャンセルできません。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1175,37 +1186,37 @@ msgstr "入ってくる製品を追跡するために集荷リストが作成さ
 msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
-msgstr ""
+msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "ダッシュボード"
 
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "参照は会社ごとに固有でなければいけません。"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "製品の価値"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "税金額"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "見積"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -1215,37 +1226,40 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"発注オーダー行基準：請求書制御 > 発注基準の中で各独立した行を選択して請求書を作成\n"
+"生成請求書基準：ドラフト請求書を作成し後で検証\n"
+"受領基準：受領が確認された時に請求書を作成"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "住所"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "分類別製品"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "検証日数"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "この発注オーダー要求を生成したドキュメントの参照"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "まだ発注オーダーは承認されていません。"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1257,80 +1271,83 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"発注オーダーまたは見積要求の状態。見積はドラフト状態の発注オーダーです。そして、オーダーがユーザにより確認されると状態は確認済に切り替わります。それから、"
+"仕入先は状態を承認済に変えるためにオーダーの確認が必要です。発注オーダーが支払われそして受け取った時に状態は完了になります。請求書や製品の到着でキャンセル"
+"アクションが発生すると、状態は例外になります。"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小計"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0 view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "倉庫"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:289
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr ""
+msgstr "発注オーダー %s は確認されました。"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "発注オーダーの承認日"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
 #: view:purchase.order.line:0 field:purchase.order.line,state:0
 #: view:purchase.report:0 view:stock.picking:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr ""
+msgstr "承認済"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "一般情報"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "請求外"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: purchase
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0 selection:purchase.report,state:0
 #: view:stock.picking:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "見積依頼番号"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "請求のための確認済発注オーダー"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1338,17 +1355,17 @@ msgstr ""
 #: view:purchase.order:0 view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "発注オーダー行"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "仕入先は発注オーダーを承認します。"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1358,99 +1375,99 @@ msgstr ""
 #: view:purchase.report:0
 #, python-format
 msgid "Purchase Orders"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "基となるドキュメント"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "オーダーの集約"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "発注オーダー行は請求書を作成します。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "内部出荷"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "ユーザの月別合計オーダー"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Request for Quotation"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "TEL ："
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "月順"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "発注オーダーの検索"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "デフォルト請求書制御方法をセット"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "日付要求"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0 field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr ""
+msgstr "承認日"
 
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "仕入先確認待ち"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "ドラフト請求書基準"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "配送と請求"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:772
@@ -1458,57 +1475,57 @@ msgstr ""
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
-msgstr ""
+msgstr "選択した仕入先の最小数量は %s %s に設定されています。それ未満の発注はできません。"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: purchase
 #: field:purchase.order,product_id:0 view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0 view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "確認"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,name:0
 #: report:purchase.quotation:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "年順"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "予想配達住所："
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "受領分析"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "発注リードタイム"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1517,103 +1534,105 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"仕入先レコードにアクセスして、仕入先との良好な関係を維持して下さい。履歴タブから仕入先との全ての相互のやりとりを追跡できます：Eメール、オーダー、ミーティ"
+"ングなど"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "配達"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "発注オーダーは完了状態です。"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "製品単位"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "それでは、よろしくお願いいたします。"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "待機中"
 
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "住所"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "単位の参照"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "予約"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "請求なしの行を含む発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "請求のための集荷"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
-msgstr ""
+msgstr "このツールは仕入先請求書の制御に使いたい方法を選択するのに役立ちます。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-msgstr ""
+msgstr "この製品のための仕入先がないケースでは、買い手はフォームを手動で埋めて、確認をします。見積依頼は発注オーダー確認済となります。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "発注分析"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,minimum_planned_date:0
 #: report:purchase.quotation:0 field:purchase.report,expected_date:0
 #: view:stock.picking:0
 msgid "Expected Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA："
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -1621,22 +1640,22 @@ msgid ""
 "If you set the Invoicing Control on a purchase order as \"Based on "
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
-msgstr ""
+msgstr "発注オーダーの請求書制御で受領基準をセットした場合、全での製品受領をここで追跡し、それらの受領のために請求書を作成できます。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr ""
+msgstr "発注制御"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1653,47 +1672,57 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" 次のことに注意して下さい： \n"
+" \n"
+" 次の条件の時にのみオーダーは集約されます： \n"
+" ・ 発注オーダーがドラフトである。\n"
+" ・ 発注オーダーが同じ仕入先に属している\n"
+" ・ 発注オーダーが同じ在庫場所で同じ価格リストである\n"
+" \n"
+" 次の条件の時に行は集約されます：\n"
+" ・ オーダー行は製品の数量と単位以外は完全に同じである \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "発注標準価格"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "デフォルト請求書制御方法"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
+msgstr "発注価格リスト"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "デフォルト発注価格リストバージョン"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "請求"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1706,44 +1735,48 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" ドラフト状態は、発注オーダーがドラフト状態の時に自動的にセットされます。\n"
+"確認済状態は、発注オーダーが確認状態の時に自動的にセットされます。\n"
+"完了状態は、発注オーダーが完了としてセットされると自動的にセットされます。\n"
+"キャンセル済状態は、、ユーザが発注オーダーをキャンセルすると自動的にセットされます。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "発注オーダー %s はキャンセルされます。"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "合計"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "価格リストバージョン"
 
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー：再帰的なメンバーを作ることはできません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
 #: code:addons/purchase/wizard/purchase_line_invoice.py:112
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この製品のために定義された費用勘定がありません：%s（ID：%d）"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders?"
-msgstr ""
+msgstr "本当にこれらのオーダーを集約しますか？"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "発注オーダーから"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1752,6 +1785,8 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"発注フォームから価格リストまたは仕入先を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
 
 #. module: purchase
 #: model:email.template,body_text:purchase.email_template_edi_purchase
@@ -1809,21 +1844,71 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''} 様、\n"
+"\n"
+"これは発注の確認です。 ${object.company_id.name}:\n"
+"       | オーダー番号： *${object.name}*\n"
+"       | オーダー合計： *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | オーダー日： ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | オーダーの参照： ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | あなた様の参照： ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | あなた様の連絡先： ${object.validator.name} ${object.validator.user_email "
+"and '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"オーダー確認を閲覧またはダウンロードできます。次のリンクをご利用ください。\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"もし、何かございましたら、ご遠慮なくお知らせ下さい。\n"
+"\n"
+"ありがとうございます。\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "ドラフト状態の発注オーダー"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "マネジャ"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1833,56 +1918,56 @@ msgstr ""
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "今年のオーダー"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "発注"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "発注オーダー行基準"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+msgstr "発注管理"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "開いている受注オーダーの選択"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "オーダー"
 
 #. module: purchase
 #: help:purchase.order,name:0
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "発注オーダーが作成される時に発注オーダーの固有番号は自動的に計算されます。"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "発注ダッシュボード"
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ea7f6eb230e..dbdfcbc4fbd 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -212,7 +212,7 @@ class sale_order(osv.osv):
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+            ], 'Status', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b439c7ff4f0..9688fb69802 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -90,7 +90,6 @@
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
                     <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>
@@ -149,11 +148,16 @@
                         <page string="Order Lines">
                             <field name="order_line">
                                 <form string="Sales Order Lines" version="7.0">
-                                    <field name="product_id"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                    <field name="name" placeholder="Porduct/Service characteristics"/>
-                                    <group>
+                                    <header>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                    </header>
+                                    <group col="4" colspan="4">
+                                        <group>
+                                            <field name="product_id"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field name="name" placeholder="Product/Service characteristics"/>
+                                        </group>
                                         <group>
                                             <label for="product_uom_qty"/>
                                             <div>
@@ -172,14 +176,16 @@
                                             </div>
                                             <field name="price_unit"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                        </group><group>
+                                        </group>
+                                    </group>
+                                    <group>
+                                        <group>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
-                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                             <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
                                         <group col="4">
@@ -189,7 +195,7 @@
                                             <field name="address_allotment_id"/>
                                         </group>
                                         <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids"/>
+                                        <field name="property_ids" colspan="4" nolabel="1" />
                                         <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                                         <field name="notes" groups="base.group_sale_notes_subtotal"/>
                                         <div groups="base.group_no_one">
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 49e7686542c..60ef80db245 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <field name="state" position="before">
+                    <xpath expr="/form/header/button[@name='stage_previous']" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </field>
+                    </xpath>
                 </data>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 3923336eb5b..9484b87652e 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -120,6 +120,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids and new_ids[0]
                 }
             else:
@@ -130,6 +131,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids
                 }
             return value
@@ -145,9 +147,9 @@ class crm_make_sale(osv.osv_memory):
         'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
     }
     _defaults = {
-         'shop_id': _get_shop_id,
-         'close': False,
-         'partner_id': _selectPartner,
+        'shop_id': _get_shop_id,
+        'close': False,
+        'partner_id': _selectPartner,
     }
 
 crm_make_sale()
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 49e0e9c1880..135c2c79fa4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,13 +60,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="standard_price" position="replace">
+                <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0"/>
-                    <group col="2" colspan="1">
+                    <div>
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"
                             type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
-                    </group>
+                    </div>
                 </field>
             </field>
         </record>
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
+                <xpath expr="//group[@name='properties']" position="before">
                     <group groups="stock.group_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
@@ -102,22 +102,20 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="status" position="after">
-                    <group colspan="2" col="3">
-                        <separator string="Stocks" colspan="4"/>
+                <group name="status" position="before" version="7.0">
+                    <group string="Stock and Expected Variations">
                         <field name="qty_available"/>
-                        <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
-                        <newline/>
-                        <field name="virtual_available"/>
-                    </group>
-                    <group colspan="2" col="2" name="stock_variations">
-                        <separator string="Expected Stock Variations" colspan="2"/>
                         <field name="incoming_qty"/>
+                        <label for="virtual_available" />
+                        <div>
+                            <field name="virtual_available" class="oe_form_inline" />
+
+                            <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
+                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_form_inline" />
+                        </div>
                         <field name="outgoing_qty"/>
                     </group>
-                    <group colspan="2" col="2" name="lot" groups="stock.group_tracking_lot,stock.group_production_lot">
-                        <separator string="Lots" colspan="4"/>
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
                         <field name="track_incoming" groups="stock.group_tracking_lot"/>
                         <field name="track_outgoing" groups="stock.group_tracking_lot"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0154af26d95..8f18b89ed1f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,15 +119,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="name"  /> 
+                        </div>
+                        <h1>
+                            <field name="name" placeholder="Annual inventory"/>
+                        </h1>
+                    </div>
                 <group>
-                    <label for="name" clas="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="name" placeholder="Annual invetory 2013"/>
-                    </h1>
-                    <group col="4">
+                    <group>
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
+                </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -182,7 +187,6 @@
                          </field>
                     </page>
                     </notebook>
-                    </group>
                     </sheet>
                 </form>
             </field>
@@ -783,62 +787,62 @@
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <field name="state" widget="statusbar"/>
+                                        <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
                                     </header>
                                     <group>
-                                    <group string="Move Information">
-                                        <field name="name" invisible="1"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                        <label for="product_qty"/>
-                                        <div>
-                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
-                                            <button name="%(stock.move_scrap)d"
-                                                    string="Scrap" type="action"
-                                                    icon="gtk-convert" context="{'scrap': True}"
-                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        </div>
-                                        <label for="product_uos_qty" groups="product.group_uos"/>
-                                        <div>
-                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
-                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                        </div>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                    </group>
+                                        <group string="Move Information">
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div>
+                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
 
-                                    <group string="Locations" groups="stock.group_locations">
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                    </group>
+                                        <group string="Dates">
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
 
-                                    <group string="Dates">
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                    </group>
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                        </group>
 
-                                    <group groups="stock.group_tracking_lot" string="Traceability">
-                                        <label for="tracking_id"/>
-                                        <div>
-                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
-                                            <button name="%(split_into)d" string="New Pack" type="action"
-                                                  groups="product.group_stock_packaging"
-                                                  icon="terp-stock_effects-object-colorize"
-                                                  states="draft,assigned,confirmed"/>
-                                        </div>
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
 
-                                        <label for="prodlot_id"/>
-                                        <div>
-                                            <field name="prodlot_id" groups="stock.group_production_lot"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
-                                            <button name="%(track_line)d"
-                                                groups="stock.group_tracking_lot"
-                                                states="draft,waiting,confirmed,assigned"
-                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                        </div>
-                                    </group>
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
                                     </group>
                                 </form>
                             </field>
@@ -1219,32 +1223,37 @@
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                <field name="product_qty"
+                                    on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
+                                    class="oe_form_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
+                            <label for="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                    class="oe_form_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
+                            </div>
+                            <field name="name" string="Reason"/>
+                        </group>
+                        <group>
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"/>
-                        </group>
-                        <group string="Move Information">
-                            <field name="name" string="Reason"/>
-                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
-                        </group>
-                        <group string="Picking" name="picking">
-                            <field name="picking_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group string="Dates">
                             <field name="create_date" groups="base.group_no_one" />
                             <field name="date" groups="base.group_no_one" />
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+
                         </group>
-                        <group string="Traceability">
+                        <group>
                             <label for="tracking_id"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
@@ -1418,16 +1427,13 @@
                             <field name="product_uos" groups="product.group_uos"/>
                         </div>
                         <field name="name" string="Reason"/>
-                    </group><group>
+                    </group>
+                    <group>
+                        <field name="picking_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
                         <field name="partner_id"/>
-                    </group>
-                    <group name="picking">
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>