[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje

75 files changed, 2818 insertions, 1289 deletions

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 18723237c7a..bbc47f6a6e3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -373,8 +373,7 @@
                                 <field name="origin" placeholder="SO0032"/>
                                 <field name="move_id" groups="account.group_account_user"/>
                             </group>
-                            <separator string="Additional Information"/>
-                            <field name="comment"/>
+                            <field name="comment" placeholder="Add an additional information in the invoice..."/>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index accdf95d929..95b53b51339 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -997,6 +997,11 @@ class account_move_line(osv.osv):
         for journal in journals:
             all_journal.append(journal.id)
             for field in journal.view_id.columns_id:
+                # sometimes, it's possible that a defined column is not loaded (the module containing 
+                # this field is not loaded) when we make an update.
+                if field.name not in self._columns:
+                    continue
+
                 if not field.field in fields:
                     fields[field.field] = [journal.id]
                     fld.append((field.field, field.sequence))
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3f9d490ceb2..6dcddb49ef3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1828,27 +1828,28 @@
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
                     </header>
-
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="model_id"/>
-                            <field name="ref"/>
-                        </group>
-                        <newline/>
-
-                        <group string="Starts on">
-                            <field name="date_start"/>
-                            <field name="period_total"/>
-                        </group>
-
-                        <group string="Valid Up to">
-                            <field name="period_nbr"/>
-                            <field name="period_type"/>
+                            <group>
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="ref"/>
+                            </group>
+                            <newline/>
+    
+                            <group string="Starts on">
+                                <field name="date_start"/>
+                                <field name="period_total"/>
+                            </group>
+    
+                            <group string="Valid Up to">
+                                <field name="period_nbr"/>
+                                <field name="period_type"/>
+                            </group>
                         </group>
-                    </group>
-                    <separator string="Subscription Lines"/>
-                    <field name="lines_id" widget="one2many_list"/>
+                        <separator string="Subscription Lines"/>
+                        <field name="lines_id" widget="one2many_list"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -2356,8 +2357,8 @@
                   <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <group string="res_config_contents" position="replace">
-                	<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150"/>
-                	<separator string="Generate Your Chart of Accounts from a Chart Template"/>
+                	<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150" />
+                	<separator string="Generate Your Chart of Accounts from a Chart Template" />
                     <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     <field name="code_digits" groups="account.group_account_user"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 0e67952cf5d..05f8da6fd3f 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -114,7 +114,7 @@
                                     <group name="bank" string="Information About the Bank">
                                         <field name="bank" on_change="onchange_bank_id(bank)"/>
                                         <field name="bank_name"/>
-                                        <field name="bank_bic"/>
+                                        <field name="bank_bic" placeholder="[Identifier code]"/>
                                     </group>
                                 </group>
                             </form>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index a4454987c16..1bca6b341bd 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -31,7 +31,7 @@
        </field>
     </record>
 
-    <record id="account.journal_col11" model="account.journal.column">
+    <record id="journal_col11" model="account.journal.column">
         <field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
         <field eval="11" name="sequence"/>
         <field name="view_id" ref="account.account_journal_view"/>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 5797605471a..2e939ae7b58 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -231,19 +231,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Lines" version="7.0">
-                    <group col="4">
-                        <field name="crossovered_budget_id"/>
-                        <field name="analytic_account_id"/>
-                        <field name="general_budget_id"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <field name="paid_date"/>
-                        <field name="planned_amount"/>
-                        <field name="practical_amount"/>
-                        <field name="theoritical_amount"/>
-                        <field name="percentage"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="crossovered_budget_id"/>
+                            <field name="analytic_account_id"/>
+                            <field name="general_budget_id"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                            <field name="paid_date"/>
+                            <field name="planned_amount"/>
+                            <field name="practical_amount"/>
+                            <field name="theoritical_amount"/>
+                            <field name="percentage"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 9a246ced34e..6289270854f 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -243,24 +243,26 @@
     </record>
     
     <record model="ir.ui.view" id="view_account_coda_form">
-      <field name="name">account.coda.form</field>
-      <field name="model">account.coda</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form string="CODA File" version="7.0">
-              <group col="4">
-                  <field name="coda_creation_date"/>
-                  <field name="name"/>
-                  <field name="coda_data" filename="name"/>
-                  <field name="date"/>
-                  <field name="user_id"/>
-                  <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              </group>
-              <separator string="Additional Information"/>
-              <field name="note"/>
-              <field name="statement_ids"/>
-          </form>
-      </field>
+        <field name="name">account.coda.form</field>
+        <field name="model">account.coda</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="CODA File" version="7.0">
+                <sheet>
+                    <group col="4">
+                        <field name="coda_creation_date"/>
+                        <field name="name"/>
+                        <field name="coda_data" filename="name"/>
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <separator string="Additional Information"/>
+                    <field name="note"/>
+                    <field name="statement_ids"/>
+                </sheet>
+            </form>
+        </field>
     </record>
     
     <record id="view_account_coda_filter" model="ir.ui.view">
@@ -324,57 +326,59 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Bank Statement" version="7.0">
-              <group col="4">
-                  <field name="name"/>
-                  <field name="date"/>
-                  <field name="coda_bank_account_id"/>
-                  <field name="currency"/>
-                  <field name="period_id"/>
-                  <field name="type"/>
-                  <newline/>
-                  <field name="balance_start"/>
-                  <field name="balance_end_real"/>
-              </group>
-              <notebook>
-                <page string="Transactions">
-                  <field name="line_ids">
-                    <tree string="CODA Statement Lines">
-                      <field name="sequence" string="Seq"/>
+              <sheet>
+                  <group col="4">
+                      <field name="name"/>
                       <field name="date"/>
-                      <field name="val_date"/>
-                      <field name="ref"/>
-                      <field name="name" width="250"/>
+                      <field name="coda_bank_account_id"/>
+                      <field name="currency"/>
+                      <field name="period_id"/>
                       <field name="type"/>
-                      <field name="partner_id"/>
-                      <field name="account_id"/>
-                      <field name="amount"/>
-                      <field name="globalisation_amount" string="Glob. Amount"/>
-                      <field name="globalisation_id" string="Glob. Id"/>
-                    </tree>
-                    <form string="CODA Statement Lines" version="7.0">
-                      <group col="4">
+                      <newline/>
+                      <field name="balance_start"/>
+                      <field name="balance_end_real"/>
+                  </group>
+                  <notebook>
+                    <page string="Transactions">
+                      <field name="line_ids">
+                        <tree string="CODA Statement Lines">
                           <field name="sequence" string="Seq"/>
                           <field name="date"/>
                           <field name="val_date"/>
-                          <field name="name"/>
+                          <field name="ref"/>
+                          <field name="name" width="250"/>
                           <field name="type"/>
                           <field name="partner_id"/>
-                          <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                          <field name="account_id"/>
                           <field name="amount"/>
-                          <field name="ref"/>
-                          <field name="globalisation_amount"/>
-                          <field name="globalisation_level"/>
-                          <field name="globalisation_id"/>
-                      </group>
-                      <separator string="Notes"/>
-                      <field name="note"/>
-                    </form>
-                  </field>
-                </page>
-              </notebook>
-              <group colspan="4">
-                <field name="balance_end"/>
-              </group>
+                          <field name="globalisation_amount" string="Glob. Amount"/>
+                          <field name="globalisation_id" string="Glob. Id"/>
+                        </tree>
+                        <form string="CODA Statement Lines" version="7.0">
+                          <group col="4">
+                              <field name="sequence" string="Seq"/>
+                              <field name="date"/>
+                              <field name="val_date"/>
+                              <field name="name"/>
+                              <field name="type"/>
+                              <field name="partner_id"/>
+                              <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                              <field name="amount"/>
+                              <field name="ref"/>
+                              <field name="globalisation_amount"/>
+                              <field name="globalisation_level"/>
+                              <field name="globalisation_id"/>
+                          </group>
+                          <separator string="Notes"/>
+                          <field name="note"/>
+                        </form>
+                      </field>
+                    </page>
+                  </notebook>
+                  <group colspan="4">
+                    <field name="balance_end"/>
+                  </group>
+              </sheet>
           </form>
       </field>
     </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 6dcbc6d5821..47eec587faa 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -302,19 +302,34 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="currency_id" invisible="1"/>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="parter_id" /> 
+                        </div>
+                        <h1>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                        </h1>
+                    </div>
+                    <div>
+                        Pay
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
+                            class="oe_form_inline"
                             on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                        by
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection"
+                            class="oe_form_inline"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
+
+                    </div>
+
+                    <group col="6">
+                        <field name="currency_id" invisible="1"/>
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index c3788c967d9..0fe06e34be2 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -225,18 +225,35 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Supplier Voucher">
+                    <div class="oe_form_title">
+                        <label for="number" class="oe_form_readonly_hidden"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
                     <field name="pay_now" invisible="1"/>
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
+                            <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due"/>
+                            <field name="name" colspan="2"/>
+
+                        </group>
+                        <group>
+                            <field name="paid" invisible="1"/>
+                            <field name="currency_id"/>
+                            <field name="journal_id"
+                                domain="[('type','in',['purchase','purchase_refund'])]"
+                                widget="selection"
+                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="reference"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+
+                    </group>
                     <group col="6">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
-                        <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="reference"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
@@ -248,20 +265,29 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="3">
-                                <group col="1" string="Internal Notes">
-                                    <field name="narration"/>
-                                </group>
-                                <group col="2">
-                                    <separator string="Payment Terms" colspan="2"/>
-                                    <field name="date_due"/>
-                                    <field name="paid" invisible="1"/>
-                                </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','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>
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
+                                <group class="oe_form_subtotal_footer">
+                                    <!--
+                                    <div>
+                                        <label for="tax_id" />
+                                        <button type="object" 
+                                            icon="terp-stock_format-scientific" 
+                                            name="compute_tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </div>
+                                    -->
+                                    <field name="tax_id" 
+                                        on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
+                                        widget="selection"
+                                        domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
+                                        />
+                                    <field name="tax_amount" />
+                                    <field name="amount" string="Total" class="oe_form_subtotal_footer_separator"/>
+                                </group>                                    
+
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 162c38b3da1..77bb6f2e82a 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -10,6 +10,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymized Field" version="7.0">
+            	<sheet>
                 <group col="4">
                     <field name="model_id" on_change="onchange_model_id(model_id)" />
                     <field name="model_name" on_change="onchange_model_name(model_name)" />
@@ -20,6 +21,7 @@
                     <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
                     <field name="state" />
                 </group>
+                </sheet>
             </form>
         </field>
     </record>
@@ -102,6 +104,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymization History" version="7.0">
+            	<sheet>
                 <group col="4">
                     <field name="date"/>
                     <field name="state"/>
@@ -119,6 +122,7 @@
                         </tree>
                     </field>
                 </group>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 507809d10d4..a7bbf1e753a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -12,13 +12,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Rule" version="7.0">
-                    <header>
-                        <button string="_Subscribe" name="subscribe" icon="gtk-ok"
-                            type="object" states="draft" />
-                        <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
-                            type="object" states="subscribed" />
-                        <field name="state" widget="statusbar"/>
-                    </header>
+                   <header>
+                       <button string="_Subscribe" name="subscribe" icon="gtk-ok"
+                           type="object" states="draft" />
+                       <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
+                           type="object" states="subscribed" />
+                       <field name="state" widget="statusbar"/>
+                   </header>
+                 <sheet>
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="object_id"/>
@@ -32,6 +33,7 @@
                         <field name="user_id" colspan="4" nolabel="1" />
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
+                   </sheet>  
                 </form>
             </field>
         </record>
@@ -97,6 +99,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Logs" version="7.0">
+                 <sheet>
                     <group col="4">
                         <field name="timestamp" required="1" readonly="1"/>
                         <field name="user_id" readonly="1"/>
@@ -142,6 +145,7 @@
                             <field name="new_value_text" />
                         </tree>
                     </field>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index c51735f8ded..11d53a0899c 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -13,80 +13,82 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="model_id" on_change="onchange_model_id(model_id)"/>
-                        <field name="filter_id" />
-                        <field name="sequence"/>
-                        <field name="active"/>
-                    </group>
-                    <notebook>
-                        <page string="Conditions">
-                            <group>
-                                <group name="model" string="Conditions on Model Fields">
-                                    <field name="regex_name"/>
-                                    <field name="trg_user_id"/>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="model_id" on_change="onchange_model_id(model_id)"/>
+                            <field name="filter_id" />
+                            <field name="sequence"/>
+                            <field name="active"/>
+                        </group>
+                        <notebook>
+                            <page string="Conditions">
+                                <group>
+                                    <group name="model" string="Conditions on Model Fields">
+                                        <field name="regex_name"/>
+                                        <field name="trg_user_id"/>
+                                    </group>
+                                    <group name="partner" string="Conditions on Model Partner">
+                                        <field name="trg_partner_id"/>
+                                        <field name="trg_partner_categ_id"/>
+                                    </group>
+                                    <group string="Conditions on States">
+                                        <field name="trg_state_from"/>
+                                        <field name="trg_state_to"/>
+                                    </group>
+                                    <group string="Conditions on Timing">
+                                        <field name="trg_date_type"/>
+                                        <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
+                                            <field name="trg_date_range" string="Delay After Trigger Date"/>
+                                            <field name="trg_date_range_type"/>
+                                        </group>
+                                    </group>
                                 </group>
-                                <group name="partner" string="Conditions on Model Partner">
-                                    <field name="trg_partner_id"/>
-                                    <field name="trg_partner_categ_id"/>
+                                <separator string="Note"/>
+                                <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
+                            </page>
+                            <page string="Actions">
+                                <group string="Fields to Change" col="4">
+                                    <field name="act_user_id"/>
+                                    <field name="act_state"/>
                                 </group>
-                                <group string="Conditions on States">
-                                    <field name="trg_state_from"/>
-                                    <field name="trg_state_to"/>
+                                <group col="2" string="Server Action to be Triggered">
+                                    <field name="server_action_id"/>
                                 </group>
-                                <group string="Conditions on Timing">
-                                    <field name="trg_date_type"/>
-                                    <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
-                                        <field name="trg_date_range" string="Delay After Trigger Date"/>
-                                        <field name="trg_date_range_type"/>
+                            </page>
+                            <page string="Email Actions">
+                                <group col="4">
+                                    <separator colspan="4" string="Email Reminders"/>
+                                    <field name="act_remind_partner"/>
+                                    <field name="act_remind_attach"/>
+                                    <field name="act_remind_user"/>
+                                    <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
+                                        <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
                                     </group>
+                                    <separator colspan="4" string="Email Information"/>
+                                    <field name="act_email_from" />
+                                    <field name="act_email_to" />
+                                    <field name="act_mail_to_user"/>
+                                    <field colspan="4" name="act_mail_to_email"/>
+                                    <field name="act_mail_to_watchers"/>
+                                    <field colspan="4" name="act_email_cc"/>
+                                    <separator colspan="4" string="Email Body"/>
+                                    <field colspan="4" name="act_mail_body" height="250"
+                                        nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
+                                    <separator colspan="4" string="Special Keywords to be Used in the Body"/>
+                                    <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
+                                    <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
+                                    <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
+                                    <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
+                                    <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
+                                    <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
                                 </group>
-                            </group>
-                            <separator string="Note"/>
-                            <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
-                        </page>
-                        <page string="Actions">
-                            <group string="Fields to Change" col="4">
-                                <field name="act_user_id"/>
-                                <field name="act_state"/>
-                            </group>
-                            <group col="2" string="Server Action to be Triggered">
-                                <field name="server_action_id"/>
-                            </group>
-                        </page>
-                        <page string="Email Actions">
-                            <group col="4">
-                                <separator colspan="4" string="Email Reminders"/>
-                                <field name="act_remind_partner"/>
-                                <field name="act_remind_attach"/>
-                                <field name="act_remind_user"/>
-                                <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                    <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
-                                </group>
-                                <separator colspan="4" string="Email Information"/>
-                                <field name="act_email_from" />
-                                <field name="act_email_to" />
-                                <field name="act_mail_to_user"/>
-                                <field colspan="4" name="act_mail_to_email"/>
-                                <field name="act_mail_to_watchers"/>
-                                <field colspan="4" name="act_email_cc"/>
-                                <separator colspan="4" string="Email Body"/>
-                                <field colspan="4" name="act_mail_body" height="250"
-                                    nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
-                                <separator colspan="4" string="Special Keywords to be Used in the Body"/>
-                                <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
-                                <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
-                                <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
-                                <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
-                                <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
-                                <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
-                                <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
-                                <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
-                                <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
-                            </group>
-                        </page>
-                    </notebook>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
            </record>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 5046b122bf5..1dceb87d621 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -42,22 +42,20 @@
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
                 </header>
-                <sheet>
-                    <group>
-                        <group name="config_sale" colspan="4"/>
+                <group>
+                    <group name="config_sale" colspan="4"/>
 
-                        <!-- this part is necessary to allow the plugins to extend the view -->
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <separator string="Emails"/>
-                        </group>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                        <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-
-                        <group name="config_crm" colspan="2"/>
+                    <!-- this part is necessary to allow the plugins to extend the view -->
+                    <field name="module_crm" invisible="1"/>
+                    <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <separator string="Emails"/>
                     </group>
-                </sheet>
+                    <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                    <newline/>
+                    <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+
+                    <group name="config_crm" colspan="2"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/base_tools/i18n/es_AR.po b/addons/base_tools/i18n/es_AR.po
new file mode 100644
index 00000000000..d41d0eea63c
--- /dev/null
+++ b/addons/base_tools/i18n/es_AR.po
@@ -0,0 +1,32 @@
+# Spanish (Argentina) 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-06-18 18:37+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Base común para módulos herramientas"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_vat/i18n/es_CL.po b/addons/base_vat/i18n/es_CL.po
new file mode 100644
index 00000000000..a6f16bfdac0
--- /dev/null
+++ b/addons/base_vat/i18n/es_CL.po
@@ -0,0 +1,82 @@
+# Spanish (Chile) 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-18 17:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Chile) <es_CL@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:141
+#, python-format
+msgid ""
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr ""
+"El RUT no es válido. Se debe ingresar de la siguiente forma: %s\n"
+"Incluyendo dígito verificador y anteponiendo cl ."
+
+#. module: base_vat
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "El nombre de la empresa debe ser único!"
+
+#. module: base_vat
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
+
+#. module: base_vat
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr "Validador VIES VAT"
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: base_vat
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la "
+"declaración legal del IVA."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
+"Si está activada, los números de RUT de los Partners serán validados "
+"completamente en contra del servicio VIES de la UE en lugar de ser validado "
+"a través de un formato sencillo de validación (comprobación)"
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "Sujeto a IVA"
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index cab8d56891e..647b1a378da 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-16 12:58+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
+"PO-Revision-Date: 2012-06-18 18:46+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <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-09 06:41+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Año  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Crear menú"
 
 #. module: board
 #: view:board.menu.create:0
@@ -34,33 +34,33 @@ msgstr "Información del menú"
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Últimas conexiones"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in last month"
-msgstr ""
+msgstr "Registro creado en el último mes"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Tablero de Administración"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current year"
-msgstr ""
+msgstr "Registro creado en el último"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Tabla"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -71,7 +71,7 @@ msgstr "Nombre del menú"
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Actividad global semanal"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -81,29 +81,29 @@ msgstr "Título"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# de entradas"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current month"
-msgstr ""
+msgstr "Registro creado en el último mes"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Actividad mensual por documento"
 
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Resumen de configuración"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -114,37 +114,37 @@ msgstr "Definición del tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Conexiones de usuario"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Análisis de registros"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objeto"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: board
 #: field:board.board,line_ids:0
@@ -154,7 +154,7 @@ msgstr "Vistas de acciones"
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Reporte de registro"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
@@ -165,13 +165,13 @@ msgstr "¡Por favor inserte vista(s) de tablero!"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: board
 #: view:board.menu.create:0
@@ -181,17 +181,17 @@ msgstr "Crear menú para tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Línea tablero"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -201,22 +201,22 @@ msgstr "Menú padre"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -224,11 +224,13 @@ msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"tablero."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: board
 #: view:board.board:0
@@ -247,7 +249,7 @@ msgstr "¡Error de usuario!"
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -257,17 +259,17 @@ msgstr "Posición"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Página Principal"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Últimas actividades"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -292,7 +294,7 @@ msgstr "Ancho"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -302,12 +304,12 @@ msgstr "Secuencia"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: board
 #: view:board.board:0
@@ -328,13 +330,13 @@ msgstr "Crear menú del tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: board
 #: view:board.menu.create:0
diff --git a/addons/claim_from_delivery/i18n/es_AR.po b/addons/claim_from_delivery/i18n/es_AR.po
new file mode 100644
index 00000000000..0a420b27d93
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/es_AR.po
@@ -0,0 +1,23 @@
+# Spanish (Argentina) 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-18 18:38+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reclamar"
diff --git a/addons/crm_helpdesk/i18n/mn.po b/addons/crm_helpdesk/i18n/mn.po
new file mode 100644
index 00000000000..aebf579953b
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/mn.po
@@ -0,0 +1,738 @@
+# Mongolian 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-18 18:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Хаахыг Азнах"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "Хэрэгийн #"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3-р сар"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "Энэ жил хийгдсэн тусламжийн хүсэлтүүд"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Ажиглагчийн и-мэйл"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Хамгийн Өндөр"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Дотоод тэмдэглэл нэмэх"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "Тусламжийн Төвийн Хүсэлтийн Огноо"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "Миний компани"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "Туламжийн Төвийн Шинжилгээ"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Хаах огноо"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Код"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Дараагийн үйлдэл"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index fb1587b543c..3006dafa643 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -192,7 +192,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
+                <field name="company_id" position="before">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </field>
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index 1ed299dc900..88495feadcf 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/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:36+0000\n"
-"PO-Revision-Date: 2012-04-21 18:47+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-06-19 04:03+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-04-22 04:44+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -574,7 +574,7 @@ msgstr "価格情報"
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver all products at once"
-msgstr "全ての製品を一緒に配送"
+msgstr "全ての製品を一緒に配達"
 
 #. module: delivery
 #: field:delivery.carrier,use_detailed_pricelist:0
@@ -631,7 +631,7 @@ msgstr "配送コスト"
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver each product when available"
-msgstr "ある製品ごとに配送する。"
+msgstr "利用可能になった時に各製品を配達"
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
index d4dc924b6a0..235cff3a872 100644
--- a/addons/delivery/partner_view.xml
+++ b/addons/delivery/partner_view.xml
@@ -5,14 +5,11 @@
             <field name="name">res.partner.carrier.property.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="inherit_id" ref="stock.view_partner_property_form" />
             <field name="arch" type="xml">
-                <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2">
-                        <separator string="Deliveries Properties" colspan="4"/>
-                        <field name="property_delivery_carrier"/>
-                    </group>
-                </page>
+                <field name="property_stock_supplier" position="after">
+                    <field name="property_delivery_carrier"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 20a72c9d4f1..2f92db19b41 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -69,7 +69,7 @@
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Directories" col="4">
+            <form string="Directories" col="4" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="parent_id"/>
@@ -238,47 +238,49 @@
         <field name="priority" eval="1"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Documents">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Attachment">
-                    <group>
-                        <group string="Data">
-                            <field name="type"/>
-                            <newline />
-                            <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                            <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                            <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                        </group>
+            <form string="Documents" version="7.0">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="Attachment">
                         <group>
-                            <field name="res_id" invisible="True"/>
-                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <separator string="Related to" colspan="2"/>
-                            <field name="partner_id"/>
-                        </group>
-                        <group groups="base.group_no_one" string="Created">
-                            <field name="create_uid" readonly="1"/>
-                            <field name="create_date" readonly="1"/>
-                        </group>
-                        <group groups="base.group_no_one" string="Modified">
-                            <field name="write_uid" readonly="1"/>
-                            <field name="write_date" readonly="1"/>
+                            <group string="Data">
+                                <field name="type"/>
+                                <newline />
+                                <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                                <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
+                            </group>
+                            <group>
+                                <field name="res_id" invisible="True"/>
+                                <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
+                                <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
+                                <separator string="Related to" colspan="2"/>
+                                <field name="partner_id"/>
+                            </group>
+                            <group groups="base.group_no_one" string="Created">
+                                <field name="create_uid" readonly="1"/>
+                                <field name="create_date" readonly="1"/>
+                            </group>
+                            <group groups="base.group_no_one" string="Modified">
+                                <field name="write_uid" readonly="1"/>
+                                <field name="write_date" readonly="1"/>
+                            </group>
                         </group>
-                    </group>
-                </page>
-                <page string="Indexed Content - experimental" groups="base.group_no_one">
-                    <field name="index_content"/>
-                </page>
-                <page string="Notes">
-                    <field name="description"/>
-                </page>
-                </notebook>
+                    </page>
+                    <page string="Indexed Content - experimental" groups="base.group_no_one">
+                        <field name="index_content"/>
+                    </page>
+                    <page string="Notes">
+                        <field name="description"/>
+                    </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index b0101c01574..8962da0a1f3 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -7,7 +7,7 @@
         <field name="model">document.webdav.dir.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties" version="7.0">
+            <form string="Properties">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
@@ -107,7 +107,7 @@
         <field name="model">document.webdav.file.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties" version="7.0">
+            <form string="Properties">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 8fa27872870..55e51e185e3 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
@@ -98,6 +99,7 @@
                             </group>
                         </page>
                     </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index faff48708d6..d51ca934329 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -31,12 +31,13 @@
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
-                    <group col="4">
+                    <sheet>
+                     <group col="4">
                         <field name="name"/>
                         <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                         <field name="date"/>
-                    </group>
-                    <notebook>
+                     </group>
+                     <notebook>
                         <page string="Server &amp; Login">
                             <group>
                                 <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
@@ -67,6 +68,7 @@
                             </group>
                         </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index e3cfd96d26f..d78e3a4e5d1 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -19,27 +19,25 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Additional Features" colspan="4"/>
-                            <field name="module_hr_expense"/>
-                            <field name="module_hr_recruitment"/>
-                            <field name="module_hr_evaluation"/>
-                            <field name="module_hr_contract"/>
-                            <field name="module_hr_holidays"/>
-                            <newline/>
-                            <field name="module_hr_payroll"/>
-                            <button colspan="2" name="%(open_payroll_modules)d" type="action"
-                                string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
+                    <group col="4">
+                        <separator string="Additional Features" colspan="4"/>
+                        <field name="module_hr_expense"/>
+                        <field name="module_hr_recruitment"/>
+                        <field name="module_hr_evaluation"/>
+                        <field name="module_hr_contract"/>
+                        <field name="module_hr_holidays"/>
+                        <newline/>
+                        <field name="module_hr_payroll"/>
+                        <button colspan="2" name="%(open_payroll_modules)d" type="action"
+                            string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
 
-                            <separator string="Timesheets" colspan="4"/>
-                            <field name="module_hr_attendance"/>
-                            <field name="module_hr_timesheet"/>
-                            <field name="module_hr_timesheet_sheet"/>
+                        <separator string="Timesheets" colspan="4"/>
+                        <field name="module_hr_attendance"/>
+                        <field name="module_hr_timesheet"/>
+                        <field name="module_hr_timesheet_sheet"/>
 
-                            <group name="config_recruitment" colspan="4"/>
-                         </group>
-                    </sheet>
+                        <group name="config_recruitment" colspan="4"/>
+                     </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 1ba1f10f6aa..c86de82ec16 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
+                	<sheet>
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
                         <field name="action"/>
                         <field name="action_desc"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index c6ac3496e8e..5f71ac9731c 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -65,7 +65,8 @@
             <field name="model">hr.contract</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Contract">
+                <form string="Contract" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name" />
                         <field name="employee_id" />
@@ -100,6 +101,7 @@
                             </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/html_view/i18n/es_AR.po b/addons/html_view/i18n/es_AR.po
new file mode 100644
index 00000000000..d531b6d9d93
--- /dev/null
+++ b/addons/html_view/i18n/es_AR.po
@@ -0,0 +1,49 @@
+# Spanish (Argentina) 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-18 18:40+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Prueba html"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Ejemplo html"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Bancos"
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/knowledge/i18n/es_AR.po b/addons/knowledge/i18n/es_AR.po
new file mode 100644
index 00000000000..69681df62c1
--- /dev/null
+++ b/addons/knowledge/i18n/es_AR.po
@@ -0,0 +1,33 @@
+# Spanish (Argentina) 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 01:37+0100\n"
+"PO-Revision-Date: 2012-06-18 18:39+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Contenido colaborativo"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Conocimientos"
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 2e5e6785438..23d3d9d0f6c 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -11,19 +11,18 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_faq"/>
-                        <newline/>
-                        <field name="module_wiki_quality_manual"/>
+                    <newline/>
+                    <separator string="Wiki" colspan="4"/>
+                    <field name="module_wiki_faq"/>
+                    <newline/>
+                    <field name="module_wiki_quality_manual"/>
 
-                        <separator string="Documents" colspan="4"/>
-                        <field name="module_document"/>
-                        <newline/>
-                        <field name="module_document_ftp"/>
-                        <newline/>
-                        <field name="module_document_webdav"/>
-                    </sheet>
+                    <separator string="Documents" colspan="4"/>
+                    <field name="module_document"/>
+                    <newline/>
+                    <field name="module_document_ftp"/>
+                    <newline/>
+                    <field name="module_document_webdav"/>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index b4f96afc700..7640dee6f56 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -9,14 +9,16 @@
             <field name="inherit_id" ref="account.view_wizard_multi_chart"/>

             <field name="arch" type="xml">

               <data>

-                    <xpath expr="//form/group/group/separator" position="attributes">

+<!--

+                    <xpath expr="//group[@string='res_config_contents']/separator" position="attributes">

                         <attribute name="string">

                         Generate Your UK Accounting Chart from a Chart Template

                         </attribute>

                     </xpath>

-                    <xpath expr="//form/group/group/label" position="attributes">

+                    <xpath expr="//group[@string='res_config_contents']/label" position="attributes">

                         <attribute name="string">SELECT 4 DIGIT ACCOUNTS.  This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/ Financial Accounts/Generate Chart of Accounts from a Chart Template.</attribute>

                     </xpath>

+-->                    

               </data>

             </field>

         </record>

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 37069007638..1b5221a33f0 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -346,11 +346,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Box Amount by User" version="7.0">
+                 <sheet>
                     <group col="4">
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
                     </group>
+                 </sheet>   
                 </form>
             </field>
         </record>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index fd70bedd77c..764d25e98d3 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -50,27 +50,29 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group">
-                    <group colspan="4" col="8">
-                        <group colspan="6" col="4">
-                            <separator string="General Information" colspan="4"/>
-                            <field name="name" colspan="2"/>
-                            <field name="responsible_id" colspan="2"/>
-                            <newline/>
-                            <field name="description" colspan="4"/>
+                <form string="Group" version="7.0">
+                    <sheet>
+                        <group colspan="4" col="8">
+                            <group colspan="6" col="4">
+                                <separator string="General Information" colspan="4"/>
+                                <field name="name" colspan="2"/>
+                                <field name="responsible_id" colspan="2"/>
+                                <newline/>
+                                <field name="description" colspan="4"/>
+                            </group>
+                            <group colspan="1" col="2">
+                                <separator string="Group Image" colspan="2"/>
+                                <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
+                            </group>
+                            <group colspan="1" col="2">
+                                <separator string="Privacy Settings" colspan="2"/>
+                                <field name="public" nolabel="1"/>
+                                <label string="This group is visible by non members" colspan="2"/>
+                            </group>
                         </group>
-                        <group colspan="1" col="2">
-                            <separator string="Group Image" colspan="2"/>
-                            <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Privacy Settings" colspan="2"/>
-                            <field name="public" nolabel="1"/>
-                            <label string="This group is visible by non members" colspan="2"/>
-                        </group>
-                    </group>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
-                            options='{"thread_level": 1}'/>
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
+                                options='{"thread_level": 1}'/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index b5479a110e5..68dcd610317 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -26,20 +26,22 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Message" version="7.0">
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="subject"/>
-                            <field name="date"/>
-                            <field name="type"/>
-                            <field name="body_text"/>
-                        </group>
-                        <group>
-                            <field name="user_id" string="User"/>
-                            <field name="model"/>
-                            <field name="res_id"/>
-                            <field name="parent_id"/>
+                            <group>
+                                <field name="subject"/>
+                                <field name="date"/>
+                                <field name="type"/>
+                                <field name="body_text"/>
+                            </group>
+                            <group>
+                                <field name="user_id" string="User"/>
+                                <field name="model"/>
+                                <field name="res_id"/>
+                                <field name="parent_id"/>
+                            </group>
                         </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -80,57 +82,59 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
-                    <label for="subject" class="oe_form_readonly_hidden"/>
-                    <h1><field name="subject"/></h1>
-                    <label for="user_id"/>
-                    <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
-                    <group col="4">
-                        <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                        <field name="type"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Details">
-                            <group string="Recipients">
-                                <field name="email_from"/>
-                                <field name="email_to"/>
-                                <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
-                                <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
-                                <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
-                            </group>
-                            <group col="4" string="Message Details">
-                                <field name="model"/>
-                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
-                                <field name="res_id"/>
-                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
-                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
-                            </group>
-                            <notebook>
-                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
-                                    <field name="body_html" widget="text_html"/>
-                                </page>
-                                <page string="Body (Plain)">
-                                    <field name="body_text" widget="text"/>
-                                </page>
-                            </notebook>
-                            <group col="5">
-                                <field name="state" colspan="2"/>
-                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
-                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                            </group>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids"/>
-                        </page>
-                        <page string="Advanced" groups="base.group_no_one">
-                            <group col="2" colspan="4">
-                                <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
-                                <field name="auto_delete"/>
-                                <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <sheet>
+                        <label for="subject" class="oe_form_readonly_hidden"/>
+                        <h1><field name="subject"/></h1>
+                        <label for="user_id"/>
+                        <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
+                        <group col="4">
+                            <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                            <field name="type"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Details">
+                                <group string="Recipients">
+                                    <field name="email_from"/>
+                                    <field name="email_to"/>
+                                    <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+                                    <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                    <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+                                </group>
+                                <group col="4" string="Message Details">
+                                    <field name="model"/>
+                                    <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+                                    <field name="res_id"/>
+                                    <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                    <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
+                                </group>
+                                <notebook>
+                                    <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+                                        <field name="body_html" widget="text_html"/>
+                                    </page>
+                                    <page string="Body (Plain)">
+                                        <field name="body_text" widget="text"/>
+                                    </page>
+                                </notebook>
+                                <group col="5">
+                                    <field name="state" colspan="2"/>
+                                    <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+                                    <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                                </group>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group col="2" colspan="4">
+                                    <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+                                    <field name="auto_delete"/>
+                                    <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                    <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index c51818f13f5..acbfc4ad9ba 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -11,13 +11,11 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4" string="Campaigns">
-                            <field name="module_marketing_campaign"/>
-                            <field name="module_marketing_campaign_crm_demo"/>
-                            <field name="module_crm_profiling"/>
-                        </group>
-                    </sheet>
+                    <group col="4" string="Campaigns">
+                        <field name="module_marketing_campaign"/>
+                        <field name="module_marketing_campaign_crm_demo"/>
+                        <field name="module_crm_profiling"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index abc71e61a27..b099d4cc406 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -94,10 +94,15 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <field name="membership" readonly="0"/>
-                        <newline/>
-                        <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
-                        <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                        <group>
+                            <group>
+                                <field name="membership" readonly="0"/>
+                            </group>
+                            <group>
+                                <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                                <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                            </group>
+                        </group>
                     </page>
                 </page>
             </field>
@@ -235,23 +240,23 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Membership">
-                        <group colspan="2" col="2">
-                            <group colspan="4" col="3">
-                            <field name="free_member"/>
-                            <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
-                            <field colspan="4" name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
-                            <field colspan="4" name="membership_state"/>
+                        <group>
+                            <group>
+                                <field name="free_member"/>
+                                <field colspan="4" name="membership_state"/>
+                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
+                            </group>
+                            <group>
+                                <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
+                                <field name="membership_start"/>
+                                <field name="membership_stop"/>
+                                <field name="membership_cancel"/>
                             </group>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="membership_start"/>
-                            <field name="membership_stop"/>
-                            <field name="membership_cancel"/>
                         </group>
                         <field name="member_lines" nolabel="1" colspan="4" readonly="1">
                             <tree string="Memberships">
                                 <field name="date"/>
-                                <field name="membership_id"/>
+                                <field name="membership_id" string="Membership"/>
                                 <field name="member_price"/>
                                 <field name="account_invoice_id"/>
                                 <field name="state"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8377c13e4aa..6947d7176af 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -322,61 +322,66 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
-                        <field name="product_qty" class="oe_form_inline"/>
-                        <field name="product_uom" class="oe_form_inline"/>
-                    </h1>
-                    <label for="routing_id" class="oe_form_readonly_hidden"/>
-                    <h2>
-                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                    </h2>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="code" string="Reference"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="product_uos_qty" groups="product.group_uos" />
-                            <field name="product_uos"  groups="product.group_uos"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Components">
-                            <field name="bom_lines" widget="one2many_list">
-                                <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"/>
-                                    <field name="name" invisible="1"/>
-                                    <field name="date_start"/>
-                                    <field name="date_stop"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field name="revision_ids"/>
-                        </page>
-                        <page string="Properties" groups="product.group_mrp_properties">
-                            <group col="4">
-                                <field name="position"/>
-                                <field name="active"/>
-                                <field name="sequence"/>
-                                <field name="bom_id"/>
-
-                                <field name="date_start"/>
-                                <field name="date_stop"/>
-                                <field name="product_rounding"/>
-                                <field name="product_efficiency"/>
-                            </group>
-                            <separator string="Properties"/>
-                            <field name="property_ids"/>
-                        </page>
-                    </notebook>
-                    <newline/>
+                	<sheet>
+	                    <label for="product_id" class="oe_form_readonly_hidden"/>
+	                    <h1>
+	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
+	                        <field name="product_qty" class="oe_form_inline"/>
+	                        <field name="product_uom" class="oe_form_inline"/>
+	                    </h1>
+	                    <label for="routing_id" class="oe_form_readonly_hidden"/>
+	                    <h2>
+	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
+	                    </h2>
+	                    <group>
+	                        <group>
+	                            <field name="name"/>
+	                            <field name="code" string="Reference"/>
+	                        </group>
+	                        <group>
+	                            <field name="type"/>
+	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                            <field name="product_uos_qty" groups="product.group_uos" />
+	                            <field name="product_uos"  groups="product.group_uos"/>
+	                        </group>
+	                    </group>
+	                    <notebook>
+	                        <page string="Components">
+	                            <field name="bom_lines" widget="one2many_list">
+	                                <tree string="Components" editable="bottom">
+	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+	                                    <field name="product_qty"/>
+	                                    <field name="product_uom"/>
+	                                    <field name="name" invisible="1"/>
+	                                    <field name="date_start"/>
+	                                    <field name="date_stop"/>
+	                                </tree>
+	                            </field>
+	                        </page>
+	                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+	                            <field name="revision_ids"/>
+	                        </page>
+	                        <page string="Properties" groups="product.group_mrp_properties">
+	                            <group>
+                                        <group>
+                                            <field name="position"/>
+                                            <field name="bom_id"/>
+                                            <field name="sequence"/>
+                                            <field name="active"/>
+                                        </group>
+                                        <group>
+                                            <field name="date_start"/>
+                                            <field name="date_stop"/>
+                                            <field name="product_rounding"/>
+                                            <field name="product_efficiency"/>
+                                        </group>
+	                            </group>
+	                            <separator string="Properties"/>
+	                            <field name="property_ids" widget="many2many_tags" />
+	                        </page>
+	                    </notebook>
+	                    <newline/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index be54110d641..a00bf797318 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,22 +11,21 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <group col="4" string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                        </group>
-                        <group string="Logistics" col="4">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material" col="4">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                    </sheet>
+                    <newline/>
+                    <group col="4" string="Manufacturing Order">
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
+                    </group>
+                    <group string="Logistics" col="4">
+                        <field name="module_mrp_jit"/>
+                        <field name="module_stock_no_autopicking"/>
+                    </group>
+                    <group string="Bill Of Material" col="4">
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/pad_project/i18n/mn.po b/addons/pad_project/i18n/mn.po
index 20d6178b3ee..80ab55d9edc 100644
--- a/addons/pad_project/i18n/mn.po
+++ b/addons/pad_project/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-18 05:27+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b832da7ef5b..fe50066955b 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -649,11 +649,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="PoS Categories" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
                         <field name="sequence"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index e976dfa5b47..babe9a33cdf 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -14,76 +14,78 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="active"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Nodes">
-                        <field name="node_ids" colspan="4" nolabel="1">
-                            <tree string="Process Nodes">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="kind"/>
-                                <field name="flow_start"/>
-                            </tree>
-                            <form string="Process Node" version="7.0">
-                                <group colspan="4" col="4">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="model_id"/>
+                        <field name="active"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Nodes">
+                            <field name="node_ids" colspan="4" nolabel="1">
+                                <tree string="Process Nodes">
                                     <field name="name"/>
-                                    <field name="flow_start"/>
+                                    <field name="model_id"/>
                                     <field name="kind"/>
-                                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Properties">
-                                        <group colspan="4" col="6">
-                                            <field name="model_id"/>
-                                            <field name="menu_id"/>
-                                            <field name="help_url" widget="url"/>
-                                        </group>
-                                        <separator string="Conditions" colspan="4"/>
-                                        <field name="model_states"/>
-                                        <field name="condition_ids" nolabel="1" colspan="4">
-                                            <tree string="Other Conditions" editable="top">
-                                                <field name="name"/>
+                                    <field name="flow_start"/>
+                                </tree>
+                                <form string="Process Node" version="7.0">
+                                    <group colspan="4" col="4">
+                                        <field name="name"/>
+                                        <field name="flow_start"/>
+                                        <field name="kind"/>
+                                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+    
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Properties">
+                                            <group colspan="4" col="6">
                                                 <field name="model_id"/>
-                                                <field name="model_states"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Transitions">
-                                        <group colspan="4" col="4">
-                                            <group colspan="2" col="2">
-                                                <field name="transition_in" nolabel="1" height="400">
-                                                    <tree string="Incoming Transitions">
-                                                        <field name="name"/>
-                                                        <field name="source_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                           <group colspan="2" col="2">
-                                                <field name="transition_out" nolabel="1" height="400">
-                                                    <tree string="Outgoing Transitions">
-                                                        <field name="name"/>
-                                                        <field name="target_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                        </group>
-                                    </page>
-                                    <page string="Notes">
-                                       <field name="note" nolabel="1" colspan="4"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
+                                                <field name="menu_id"/>
+                                                <field name="help_url" widget="url"/>
+                                            </group>
+                                            <separator string="Conditions" colspan="4"/>
+                                            <field name="model_states"/>
+                                            <field name="condition_ids" nolabel="1" colspan="4">
+                                                <tree string="Other Conditions" editable="top">
+                                                    <field name="name"/>
+                                                    <field name="model_id"/>
+                                                    <field name="model_states"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Transitions">
+                                            <group colspan="4" col="4">
+                                                <group colspan="2" col="2">
+                                                    <field name="transition_in" nolabel="1" height="400">
+                                                        <tree string="Incoming Transitions">
+                                                            <field name="name"/>
+                                                            <field name="source_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                               <group colspan="2" col="2">
+                                                    <field name="transition_out" nolabel="1" height="400">
+                                                        <tree string="Outgoing Transitions">
+                                                            <field name="name"/>
+                                                            <field name="target_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                            </group>
+                                        </page>
+                                        <page string="Notes">
+                                           <field name="note" nolabel="1" colspan="4"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -154,47 +156,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
-                <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="process_id"/>
-                    <field name="flow_start"/>
-                    <field name="kind"/>
-                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                </group>
-                <notebook>
-                    <page string="Properties">
-                        <group col="4">
-                            <field name="model_id"/>
-                            <field name="menu_id"/>
-                            <field name="help_url" widget="url"/>
-                            <field name="model_states"/>
-                        </group>
-                        <field name="condition_ids">
-                            <tree string="Other Conditions" editable="bottom">
-                                <field name="name"/>
+                <sheet layout="auto">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="process_id"/>
+                        <field name="flow_start"/>
+                        <field name="kind"/>
+                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    </group>
+                    <notebook>
+                        <page string="Properties">
+                            <group col="4">
                                 <field name="model_id"/>
+                                <field name="menu_id"/>
+                                <field name="help_url" widget="url"/>
                                 <field name="model_states"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Transitions">
-                        <field name="transition_in" nolabel="1" height="400">
-                            <tree string="Incoming Transitions">
-                                <field name="name"/>
-                                <field name="source_node_id"/>
-                            </tree>
-                        </field>
-                        <field name="transition_out" nolabel="1" height="400">
-                            <tree string="Outgoing Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                       <field name="note"/>
-                    </page>
-                </notebook>
+                            </group>
+                            <field name="condition_ids">
+                                <tree string="Other Conditions" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="model_id"/>
+                                    <field name="model_states"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Transitions">
+                            <field name="transition_in" nolabel="1" height="400">
+                                <tree string="Incoming Transitions">
+                                    <field name="name"/>
+                                    <field name="source_node_id"/>
+                                </tree>
+                            </field>
+                            <field name="transition_out" nolabel="1" height="400">
+                                <tree string="Outgoing Transitions">
+                                    <field name="name"/>
+                                    <field name="target_node_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                           <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -254,38 +258,40 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="source_node_id"/>
-                    <field name="target_node_id"/>
-                </group>
-                <notebook>
-                    <page string="Actions">
-                        <field name="action_ids">
-                            <tree string="Actions">
-                                <field name="name"/>
-                                <field name="state"/>
-                                <field name="action"/>
-                            </tree>
-                            <form string="Actions" version="7.0">
-                                <group col="4">
-                                    <field name="name" colspan="4"/>
+                <sheet layout="auto">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="source_node_id"/>
+                        <field name="target_node_id"/>
+                    </group>
+                    <notebook>
+                        <page string="Actions">
+                            <field name="action_ids">
+                                <tree string="Actions">
+                                    <field name="name"/>
                                     <field name="state"/>
                                     <field name="action"/>
-                                </group>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Workflow Transitions">
-                        <field name="transition_ids"/>
-                    </page>
-                    <page string="Associated Groups">
-                        <field name="group_ids"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="note"/>
-                    </page>
-                </notebook>
+                                </tree>
+                                <form string="Actions" version="7.0">
+                                    <group col="4">
+                                        <field name="name" colspan="4"/>
+                                        <field name="state"/>
+                                        <field name="action"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Workflow Transitions">
+                            <field name="transition_ids"/>
+                        </page>
+                        <page string="Associated Groups">
+                            <field name="group_ids"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index cdd7be0de1f..a2f987e3aa1 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -12,7 +12,6 @@
                 <form string="Scheduler Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
                     </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 4d917230acc..4aa53511460 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -8,10 +8,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <newline/>
-                    <group col="2" colspan="2" groups="product.group_sale_pricelist">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <field name="property_product_pricelist"/>
+                    <group>
+                        <group name="pricelists" groups="product.group_sale_pricelist">
+                            <field name="property_product_pricelist"/>
+                        </group>
                     </group>
                 </page>
             </field>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 9d1e19a7c81..18c7875fcdc 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,25 +12,23 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Project" colspan="4"/>
-                            <field name="module_project_mrp"/>
-                            <field name="module_project_timesheet"/>
-                            <field name="module_pad"/>
-                            <field name="group_tasks_work_on_tasks"/>
-                            <field name="group_time_work_estimation_tasks"/>
-                            <field name="group_manage_delegation_task"/>
+                    <group col="4">
+                        <separator string="Project" colspan="4"/>
+                        <field name="module_project_mrp"/>
+                        <field name="module_project_timesheet"/>
+                        <field name="module_pad"/>
+                        <field name="group_tasks_work_on_tasks"/>
+                        <field name="group_time_work_estimation_tasks"/>
+                        <field name="group_manage_delegation_task"/>
 
-                            <separator string="Planning" colspan="4"/>
-                            <field name="module_project_long_term"/>
+                        <separator string="Planning" colspan="4"/>
+                        <field name="module_project_long_term"/>
 
-                            <separator string="Helpdesk and Support" colspan="4"/>
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                            <group name="support" colspan="4"/>
-                        </group>
-                    </sheet>
+                        <separator string="Helpdesk and Support" colspan="4"/>
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                        <group name="support" colspan="4"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3286e9a4c3d..f2901ad7650 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -213,7 +213,7 @@
                                 </group>
                             </group>
                            <separator string="Force Assigned Users"/>
-                           <field name="user_force_ids"/>
+                           <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
                            <separator string="Next Phases"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 4a66cecf9cd..85ab158e0b2 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory):
         'target_project': fields.selection([
             ('all', 'Compute All My Projects'),
             ('one', 'Compute a Single Project'),
-            ], 'Schedule', required=True),
+            ], 'Action', required=True),
         'project_id': fields.many2one('project.project', 'Project')
     }
     _defaults = {
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index bf2c51e41e6..37c7256cb7c 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -10,9 +10,8 @@
                   <form string="Schedule Phases" version="7.0">
                       <header>
                           <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                       </header>
-                      <group string="Schedule Phases">
+                      <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index ac30a3aa6d9..3ceac7e9a9e 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -10,7 +10,6 @@
                  <form string="Schedule Tasks" version="7.0">
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/project_mailgate/i18n/sv.po b/addons/project_mailgate/i18n/sv.po
new file mode 100644
index 00000000000..8c5998150ab
--- /dev/null
+++ b/addons/project_mailgate/i18n/sv.po
@@ -0,0 +1,78 @@
+# Swedish 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:37+0000\n"
+"PO-Revision-Date: 2012-06-18 23:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Historikinformation"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Aktivitet"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:90
+#, python-format
+msgid "Draft"
+msgstr "Preliminär"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:116
+#, python-format
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:110
+#, python-format
+msgid "Done"
+msgstr "Färdig"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:96
+#, python-format
+msgid "Open"
+msgstr "Öppen"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:102
+#, python-format
+msgid "Pending"
+msgstr "Väntande"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Historik"
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index d1a48e7f556..c77262cc4bf 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-14 05:06+0000\n"
+"PO-Revision-Date: 2012-06-18 23:05+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-15 04:42+0000\n"
-"X-Generator: Launchpad (build 15414)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -344,7 +344,7 @@ 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
@@ -599,7 +599,7 @@ msgstr "住所宛名"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr "送付先："
+msgstr "送付先住所："
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 09e99bfcbdd..96981db1502 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,12 +8,9 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2" groups="product.group_purchase_pricelist">
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_product_pricelist_purchase" />
-                    </group>
-                </page>
+                <field name="property_product_pricelist" position="after">
+                    <field name="property_product_pricelist_purchase" />
+                </field>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 25b4005f729..10f7a330c9f 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -393,40 +393,42 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
-                    <label for="order_id" class="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="order_id" class="oe_form_inline"/>, 
-                        <field name="date_order" class="oe_form_inline"/>
-                    </h1>
-                    <label for="partner_id" class="oe_form_readonly_hidden"/>
-                    <h2><field name="partner_id"/></h2>
-
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="product_id" readonly="1"/>
-                            <label for="product_qty"/>
-                            <div>
-                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
-                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
-                            </div>
-                            <field name="price_unit"/>
-                        </group>
-                        <group>
-                            <field name="date_planned" widget="date"  readonly="1"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <field name="taxes_id" widget="many2many_tags"
-                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-                            <field name="invoiced"/>
-                        </group>
-                    </group>
-                    <separator string="Manual Invoices"/>
-                    <field name="invoice_lines"/>
-                    <separator string="Notes"/>
-                    <field name="notes"/>
-                    <separator string="Stock Moves"/>
-                    <field name="move_ids"/>
+                	<sheet>
+	                    <label for="order_id" class="oe_form_readonly_hidden"/>
+	                    <h1>
+	                        <field name="order_id" class="oe_form_inline"/>, 
+	                        <field name="date_order" class="oe_form_inline"/>
+	                    </h1>
+	                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+	                    <h2><field name="partner_id"/></h2>
+	
+	                    <group>
+	                        <group>
+	                            <field name="name"/>
+	                            <field name="product_id" readonly="1"/>
+	                            <label for="product_qty"/>
+	                            <div>
+	                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
+	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
+	                            </div>
+	                            <field name="price_unit"/>
+	                        </group>
+	                        <group>
+	                            <field name="date_planned" widget="date"  readonly="1"/>
+	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+	                            <field name="taxes_id" widget="many2many_tags"
+	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+	                            <field name="invoiced"/>
+	                        </group>
+	                    </group>
+	                    <separator string="Manual Invoices"/>
+	                    <field name="invoice_lines"/>
+	                    <separator string="Notes"/>
+	                    <field name="notes"/>
+	                    <separator string="Stock Moves"/>
+	                    <field name="move_ids"/>
+	            	</sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c45503faa36..c7765e756c6 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -11,7 +11,6 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
                     <group col="4">
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
@@ -28,7 +27,6 @@
                         <separator string="Products" colspan="4"/>
                         <field name="module_product_manufacturer"/>
                     </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index 3bb1b4db994..7a8c85fbf1d 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -7,120 +7,121 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-23 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-06-18 22:05+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-09 06:27+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Avbrutna fakturor"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Namnet på landet måste vara unikt !"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Landskoden måste vara unik !"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Rabatt (%)"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Leverantörsfaktura"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Styckpris"
 
 #. module: report_intrastat
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fel: Standardmåttenheten och inköpsmåttenheten måste tillhöra samma kategori."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr ""
+msgstr "Importera"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "Moms:"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Skatter:"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "augusti"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr ""
+msgstr "Faktura Intrastat"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Antal"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -130,17 +131,17 @@ msgstr ""
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Innevarande år"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -148,115 +149,115 @@ msgstr ""
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Intrastatkod"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Month"
-msgstr ""
+msgstr "Denna månad"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Partner Ref."
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Totalt (inkl. skatter)"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Intrastatrapport"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Skatter"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Summa"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Intrastat Data"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr ""
+msgstr "Värde"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Preliminär faktura"
 
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Enheter"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Återbetalning"
 
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Källdokument"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -267,79 +268,79 @@ msgstr ""
 #: report:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Vikt"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produktmall"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Intrastatmedlem"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Skatt"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
-msgstr ""
+msgstr "Landskod"
 
 #. module: report_intrastat
 #: field:report.intrastat,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr ""
+msgstr "Exportera"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Återbetalning till leverantör"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totalt (exkl. skatt)"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Pris"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Intrastatkod"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -348,3 +349,13 @@ msgstr ""
 
 #~ msgid "Intrastat Reporting - Reporting"
 #~ msgstr "Intrastat Reporting - Reporting"
+
+#~ msgid ""
+#~ "\n"
+#~ "    A module that adds intrastat reports.\n"
+#~ "    This module gives the details of the goods traded between the countries "
+#~ "of European Union "
+#~ msgstr ""
+#~ "\n"
+#~ "    En modul som lägger till intrastatrapporter.\n"
+#~ "    Denna modul visar vilka varor som handlats mellan EUländer. "
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index 1d60f6a873d..fed94c92d70 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="base.act_report_xml_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Security']" position="before" >
+                <xpath expr="//page[@string='Security']" position="before" >
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
                         <field name="webkit_header"/>
                         <field name="webkit_debug"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index bf8ab3c11e9..4da1a465c42 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -77,12 +77,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="manager"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <field name="attendance_ids"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -220,6 +222,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail" version="7.0">
+                	<sheet>
                     <group>
                        <group>
                            <field name="resource_id" on_change="onchange_resource(resource_id)"/>
@@ -234,6 +237,7 @@
                            <field name="date_to"/>
                        </group>
                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 5ac44be08b1..31d8a5d15e2 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-18 04:09+0000\n"
+"PO-Revision-Date: 2012-06-19 04:44+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-18 05:27+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -50,7 +50,7 @@ msgstr "販売単位"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr "現在の受注オーダーの出荷住所"
+msgstr "現在の受注オーダーの送付先住所"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
@@ -208,98 +208,98 @@ msgstr "同じ顧客のために請求書をグループ化するにはこのボ
 #. module: sale
 #: view:sale.order:0
 msgid "My Sale Orders"
-msgstr ""
+msgstr "私の受注オーダー"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "注文数量"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "販売員による受注"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: sale
 #: field:sale.order,name:0 field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "その他情報"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "日付"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
-msgstr ""
+msgstr "出荷方針が集荷時に請求または配達後に請求の場合は、請求書は自動的に作成されます。"
 
 #. module: sale
 #: field:sale.config.picking_policy,task_work:0
 msgid "Based on Tasks' Work"
-msgstr ""
+msgstr "タスク作業基準"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "見積と受注"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "受注による請求書作成"
 
 #. module: sale
 #: code:addons/sale/sale.py:330
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "価格リストの警告。"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "割引（%）"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 msgid "My Quotations"
-msgstr ""
+msgstr "私の見積"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "受注管理ダッシュボード"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "梱包"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "受注オーダーから"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "店名"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -315,29 +315,36 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"請求方針は請求書と配達処理を同期するために使用されます。\n"
+"  ・ \"配達前の支払\"の選択は、最初に請求書を生成し、そしてこの請求書の支払後に集荷オーダーを生成します。\n"
+"  ・ "
+"\"オンデマンドで配達と請求\"は、直接集荷オーダーを作成し、そしてユーザが受注オーダーまたは受注オーダー行基準のドラフト請求書を生成するための請求書ボタ"
+"ンを手動でクリックするのを待ちます。\n"
+"  ・ \"配達後請求\"の選択は、全ての集荷リストが終了した後に受注オーダー基準のドラフト請求書を生成します。\n"
+"  ・ \"配達基準の請求\"の選択は、集荷処理の途中で請求書を作成する時に使用されます。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "顧客が定義されていません。"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "例外の受注"
 
 #. module: sale
 #: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:70
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "設定エラーです。"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "条件"
 
 #. module: sale
 #: code:addons/sale/sale.py:1034
@@ -345,17 +352,17 @@ msgstr ""
 msgid ""
 "There is no income category account defined in default Properties for "
 "Product Category or Fiscal Position is not defined !"
-msgstr ""
+msgstr "製品分類のためのデフォルト属性の中に収入分類のアカウントが無いか、または会計ポジションが定義されていません。"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "違う製品のロットを割り当てることはできません。"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
@@ -366,43 +373,43 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: sale
 #: code:addons/sale/sale.py:617
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "この受注オーダーのキャンセルはできません。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "受注オーダーの統計値"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "受注オーダーに関連した分析アカウント"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: sale
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "参照は会社ごとに固有でなければいけません。"
 
 #. module: sale
 #: view:board.board:0 view:sale.order:0 view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "見積"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "現在の受注オーダーのための価格リスト"
 
 #. module: sale
 #: report:sale.order:0
@@ -414,69 +421,69 @@ msgstr ""
 msgid ""
 "Number of days between the order confirmation the shipping of the products "
 "to the customer"
-msgstr ""
+msgstr "オーダー確認から顧客に製品の出荷がなされるまでの日数"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "見積日"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "会計ポジション"
 
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
 msgid "UoM"
-msgstr ""
+msgstr "単位"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "パッケージ数"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
-msgstr ""
+msgstr "販売員は見積を確認します。受注オーダーの状態は進行中または手動進行中になります。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1074
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
+msgstr "受注オーダー行は既に請求済であるためキャンセルできません。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1079
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
+msgstr "最初にこの受注オーダー行に付随する在庫移動をキャンセルする必要があります。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1147
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "（利用不可）"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
 msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
-msgstr ""
+msgstr "先進製品と呼ばれるサービスタイプを選択すると、それを作成し、そしてこの項目にデフォルト値としてセットする必要があります。"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tel. :"
-msgstr ""
+msgstr "TEL："
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:64
@@ -484,112 +491,112 @@ msgstr ""
 msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
+msgstr "配達後の自動請求として定義された受注オーダーを前もって作ることはできません。"
 
 #. module: sale
 #: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: sale
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "現在の受注オーダーのための請求書住所"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "受注オーダーのオーダー月"
 
 #. module: sale
 #: code:addons/sale/sale.py:504
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
-msgstr ""
+msgstr "同じパートナに対する異なった通貨を持つ受注はグループ化できません。"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "利用可能になった時に各製品を配達"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "請求済"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr ""
+msgstr "配達オーダー"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "確認日"
 
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "インコターム"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "割当パートナ"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
 
 #. module: sale
 #: field:sale.config.picking_policy,sale_orders:0
 msgid "Based on Sales Orders"
-msgstr ""
+msgstr "受注オーダー基準"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "合計金額"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小計"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "請求書住所："
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Line Sequence"
-msgstr ""
+msgstr "行順序"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
 msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
-msgstr ""
+msgstr "全ての受注オーダー行について、調達オーダーは販売された製品の供給を作成します。"
 
 #. module: sale
 #: help:sale.order,incoterm:0
@@ -597,154 +604,155 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction."
 msgstr ""
+"インコタームは国際商業規則（International Commercial terms）の略で、商業取引で使用される販売条件のシリーズを表します。"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "請求書住所"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "未請求行の検索"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr ""
+msgstr "見積 / オーダー"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "行数"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "受注中の請求書"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "受注オーダー行"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "倉庫"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "オーダー番号"
 
 #. module: sale
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "請求書の行"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "数量"
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "その他"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "未請求かつ配達済行"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "私の受注"
 
 #. module: sale
 #: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
 #: code:addons/sale/sale.py:1303
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "追加情報"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "数量の数"
 
 #. module: sale
 #: code:addons/sale/sale.py:1327
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "時"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "オーダー日"
 
 #. module: sale
 #: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped"
-msgstr ""
+msgstr "出荷済"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "全見積"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Options"
-msgstr ""
+msgstr "オプション"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: sale
 #: code:addons/sale/sale.py:632
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgstr "行が無い受注オーダーの確認はできません。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1259
@@ -753,89 +761,91 @@ msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"受注フォームで価格リストまたは顧客を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "製品分類"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税金："
 
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: sale
 #: field:sale.order,state:0 field:sale.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "オーダー状態"
 
 #. module: sale
 #: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
 msgid "Do you really want to create the invoice(s)?"
-msgstr ""
+msgstr "本当に請求書を作成しますか？"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "月別受注"
 
 #. module: sale
 #: code:addons/sale/sale.py:1078
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "受注行はキャンセルできません。"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "安全日数"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "受注済材料の調達"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "最終請求書の作成"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "送付先住所"
 
 #. module: sale
 #: help:sale.order,shipped:0
 msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
-msgstr ""
+msgstr "これは受注オーダーが配達されたことを示します。この項目はスケジューラが起動された後にのみ更新されます。"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "例外"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "会社"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -847,22 +857,25 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"見積または受注オーダーの状態を示します。 \n"
+"請求書の検証（請求書の例外）、または集荷リスト状態（出荷例外）でキャンセル操作が発生すると、例外状態が自動的にセットされます。 \n"
+"請求書が確認され、しかしオーダー日に実行されるスケジュールを待っている時は、スケジュール待ち状態にセットされます。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
 #, python-format
 msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "適切な価格リスト行が見つかりません："
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on order after delivery"
-msgstr ""
+msgstr "配達後のオーダーの請求書"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -870,39 +883,39 @@ msgid ""
 "This is the list of invoices that have been generated for this sales order. "
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
-msgstr ""
+msgstr "これは、この受注オーダーのために生成された請求書のリストです。同じ受注オーダーは何回も請求されるかもしれません（例えば、行毎に）。"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Your Reference"
-msgstr ""
+msgstr "あなたの参照"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "オーダーや見積は連絡先の名前と住所を要求します。"
 
 #. module: sale
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
-msgstr ""
+msgstr "これは安全目的のために顧客に約束するために加える日数です。"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "参照"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr ""
+msgstr "私の受注オーダー行"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -911,12 +924,12 @@ msgstr ""
 #: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
 #: view:sale.order.line:0 view:sale.order.line.make.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -924,147 +937,147 @@ msgstr ""
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0 view:sale.order.line:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "税抜合計"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "請求書は正常に作成されました。"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "パートナ別受注"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+msgstr "オーダー連絡先"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "請求書を開く"
 
 #. module: sale
 #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
 msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "受注オーダーの自動Eメール確認"
 
 #. module: sale
 #: code:addons/sale/sale.py:413
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この会社に定義された受注仕訳帳がありません：%s（ID：%d）"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "強制割当"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr ""
+msgstr "オーダー中"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "出荷またはオーダー数量基準"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "全ての製品を一緒に配達"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "関連する集荷"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "送付先住所："
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 msgid "Sales per Customer in last 90 days"
-msgstr ""
+msgstr "最新90日間の顧客別受注"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "受注オーダーのドラフト状態"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "配達オーダーの作成"
 
 #. module: sale
 #: code:addons/sale/sale.py:1303
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
+msgstr "受注オーダー行の状態は %s であるため、削除できません。"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Qty(UoS)"
-msgstr ""
+msgstr "販売単位"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "税込合計"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "集荷リストの作成"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "受注オーダーのオーダー日"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "製品分類別受注"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "見積の確認"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:63
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化…"
 
 #. module: sale
 #: view:sale.order:0
@@ -1075,32 +1088,32 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "請求書の配達"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "スケジュール待ち"
 
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "調達方法"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "集荷リスト"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "ドラフトに設定"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "出力あるいは顧客への移動のドキュメント"
 
 #. module: sale
 #: model:email.template,body_text:sale.email_template_edi_sale
@@ -1180,37 +1193,110 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name "
+"or ''} 様、\n"
+"\n"
+"これは、お客様のご注文の確認です。 ${object.partner_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.client_order_ref:\n"
+"       | お客様： ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | お客様の連絡先： ${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"次のリンクから、ご注文のご確認、ダウンロード、また、オンラインでのお支払いが可能です。\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account：\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"直接 Paypal を使ってお支払いいただくこともできます。\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"何かご質問等がございましたら、ご遠慮なくお問い合わせ下さい。\n"
+"\n"
+"\n"
+"弊社をご利用いただき、ありがとうございました。 ${object.company_id.name}\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.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: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "検証"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "オーダーの確認"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "調達オーダーの作成"
 
 #. module: sale
 #: view:sale.order:0 field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "税金"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "請求準備のできた受注オーダー"
 
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "受注オーダーの作成日"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1310,7 +1396,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "出荷例外"
 
 #. module: sale
 #: code:addons/sale/sale.py:1156
@@ -1410,12 +1496,13 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
+"受注オーダーの出荷方針が出荷は手動で進行中の場合、販売員は請求書を手動で作成します。出荷ほうしんが配達前に支払の場合、請求書は自動的に作成されます。"
 
 #. module: sale
 #: help:sale.config.picking_policy,order_policy:0
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
-msgstr ""
+msgstr "受注オーダー基準、または出荷基準の請求書を生成できます。"
 
 #. module: sale
 #: view:sale.order.line:0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e028eb8d044..ecea78a8163 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -136,12 +136,12 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                         </group><group>
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="client_order_ref"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
                     <notebook>
@@ -196,8 +196,7 @@
                                         </group>
                                         <separator string="Properties" colspan="2"/>
                                         <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"/>
+                                        <field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/>
                                         <div groups="base.group_no_one">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
@@ -207,6 +206,7 @@
                                     </group>
                                 </form>
                                 <tree string="Sales Order Lines">
+                                    <field name="sequence" />
                                     <field name="name"/>
                                     <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@@ -223,7 +223,7 @@
                                 <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
                             </group>
                             <separator string="Notes"/>
-                            <field name="note" placeholder="Our quotation is valid for 30 days..."/>
+                            <field name="note" placeholder="Add a global note on the sale order..."/>
                         </page>
                         <page string="Other Information">
                             <group>
@@ -236,30 +236,37 @@
                                 <group>
                                     <field name="user_id"/>
                                     <field groups="base.group_no_one" name="origin"/>
-                                    <field name="invoiced"/>
-                                    <field name="shipped"/>
                                 </group>
                                 <group name="sale_pay">
                                     <field name="payment_term" widget="selection"/>
                                     <field name="fiscal_position" widget="selection"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </group>
+                                <group>
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
                             </group>
                         </page>
                         <page string="History">
                             <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}"/>
+                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
+                                <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
+                                    <field name="date_invoice" />
+                                    <field name="number" />
+                                    <field name="partner_id" />
+                                    <field name="user_id" />
+                                    <field name="date_due" />
+                                    <field name="amount_total" />
+                                    <field name="state" />
+                                </tree>
+                            </field>
                             <separator string="Delivery Orders"/>
                             <field name="picking_ids" context="{'default_type': 'out'}">
                                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                                     <field name="name"/>
-                                    <field name="partner_id"/>
-                                    <field name="origin"/>
-                                    <field name="date"/>
+                                    <field name="partner_id" string="Customer" />
                                     <field name="min_date"/>
-                                    <field name="backorder_id"/>
-                                    <field name="invoice_state"/>
-                                    <field name="stock_journal_id" widget="selection"/>
                                     <field name="state"/>
                                     <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
                                 </tree>
@@ -412,6 +419,7 @@
                         <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
+                    <sheet>
                     <label for="order_id" class="oe_form_readonly_hidden"/>
                     <h1><field name="order_id"/></h1>
                     <label for="order_partner_id" class="oe_form_readonly_hidden"/>
@@ -435,6 +443,7 @@
                     </group>
                     <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                     <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/sale_crm/i18n/mn.po b/addons/sale_crm/i18n/mn.po
index 2e9e1eef739..392435c317e 100644
--- a/addons/sale_crm/i18n/mn.po
+++ b/addons/sale_crm/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-18 05:27+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_layout/i18n/ja.po b/addons/sale_layout/i18n/ja.po
index e3611ca677b..8181cf7ad87 100644
--- a/addons/sale_layout/i18n/ja.po
+++ b/addons/sale_layout/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:37+0000\n"
-"PO-Revision-Date: 2012-06-16 04:52+0000\n"
+"PO-Revision-Date: 2012-06-19 03:18+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-17 04:35+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: sale_layout
 #: sql_constraint:sale.order:0
@@ -181,7 +181,7 @@ msgstr "区切り線"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Your Reference"
-msgstr "参照"
+msgstr "あなたの参照"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
diff --git a/addons/sale_layout/i18n/mn.po b/addons/sale_layout/i18n/mn.po
new file mode 100644
index 00000000000..ba2a15454a3
--- /dev/null
+++ b/addons/sale_layout/i18n/mn.po
@@ -0,0 +1,254 @@
+# Mongolian 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:37+0000\n"
+"PO-Revision-Date: 2012-06-18 18:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Дэд дүн"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Гарчиг"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Хөнгөлөлт. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Тэмдэглэл"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Line Type"
+msgstr "Мөрийн Төрөл"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Захиалгын N°"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Захиалгын мөрүүд"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Хөнгөлөлт.(%)"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Нэгж үнэ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Нэхэмжлэлийн мөр"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Х.Н"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Манай борлуулагч"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Утас:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Үнийн санал №"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "НӨАТ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Нэхэмжлэл бэлдэх"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Шинж"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Нэхэмжлэх хаяг :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Факс :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Захиалсан огноо"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Хүргэх хаяг :"
+
+#. module: sale_layout
+#: view:sale.order:0
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Татвар"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Цэвэр дүн :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Нийт :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Төлбөрийн нөхцөл"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Тусгаарлагч Шугам"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Таны дугаар"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Үнийн Саналын Огноо"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "НӨАТ :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Тоо"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Төлөв"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Борлуулалтын захиалгын мөр"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Зохиомжтой Эрэмбэ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Татвар :"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Хуудас Таслагч"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Захиалгын мөр"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Үнэ"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Барааны хөдөлгөөн"
diff --git a/addons/sale_margin/i18n/mn.po b/addons/sale_margin/i18n/mn.po
new file mode 100644
index 00000000000..ab077d5a45b
--- /dev/null
+++ b/addons/sale_margin/i18n/mn.po
@@ -0,0 +1,51 @@
+# Mongolian 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:37+0000\n"
+"PO-Revision-Date: 2012-06-18 18:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Өртөг үнэ"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr "Энэ нь Нэгж үнэ, Өртөг үнийн ялгааг тооцоолж ашигийг өгнө."
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Захлалт"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 519863b85f7..7ec91f73dca 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -9,9 +9,7 @@
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//group[@class='oe_form_subtotal_footer']" position="inside">
-                <group>
-                    <field name="margin"/>
-                </group>
+                <field name="margin"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 608c41a4909..8b997e2357e 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -46,7 +46,6 @@ synchronization with other companies, etc.
     'demo_xml': ['share_demo.xml'],
     'data': [
         'security/share_security.xml',
-        'share_view.xml',
         'res_users_view.xml',
         'wizard/share_wizard_view.xml'
     ],
diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
index 0927462b5c3..008dd424fa5 100644
--- a/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A. (<http://www.openerp.com>).
+#    Copyright (C) 2010-2012 OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+from openerp.osv import osv
 
-class ir_model_access(osv.osv):
+class ir_model_access(osv.Model):
     _inherit = 'ir.model.access'
 
     # overload group_names_with_access() to avoid returning sharing groups
@@ -32,17 +32,17 @@ class ir_model_access(osv.osv):
         """
         assert access_mode in ['read','write','create','unlink'], 'Invalid access mode: %s' % access_mode
         cr.execute('''SELECT
-                        g.name
+                        c.name, g.name
                       FROM
-                        ir_model_access a 
-                        JOIN ir_model m ON (a.model_id=m.id) 
+                        ir_model_access a
+                        JOIN ir_model m ON (a.model_id=m.id)
                         JOIN res_groups g ON (a.group_id=g.id)
+                        LEFT JOIN ir_module_category c ON (c.id=g.category_id)
                       WHERE
                         m.model=%s AND
                         (g.share IS NULL or g.share IS false) AND
                         a.perm_''' + access_mode, (model_name,))
-        return [x[0] for x in cr.fetchall()]
-
-ir_model_access()
+        return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
+    
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 3b74fbb4dbc..52e154c1667 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -49,9 +49,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='users']" position="attributes">
+                <field name="users" position="attributes">
                     <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
+                </field>
+                <field name="name" position="after">
+                    <field name="share"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
deleted file mode 100644
index 315f750a7f6..00000000000
--- a/addons/share/share_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_groups_form" model="ir.ui.view">
-            <field name="name">res.groups.form</field>
-            <field name="model">res.groups</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_groups_form"/>
-            <field name="arch" type="xml">
-                 <field name="name" position="after">
-                    <field name="share"/>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 4d281cb9c0f..d9537c06fe5 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-18 03:14+0000\n"
+"PO-Revision-Date: 2012-06-19 03:11+0000\n"
 "Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\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-06-18 05:27+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -714,7 +714,7 @@ msgstr "生产批次"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr "收件人"
+msgstr "接收者"
 
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
@@ -927,7 +927,7 @@ msgstr "账簿"
 #: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
-msgstr "是已计划安排 %s"
+msgstr "已计划安排 %s"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -950,7 +950,7 @@ msgstr "执行前置时间(天)"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "进行部分调拨处理的向导"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -973,7 +973,7 @@ msgstr "上月"
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
-msgstr "通过取消勾选有效字段您可以隐藏而不是删除库位."
+msgstr "通过勾选是否有效字段，您可以隐藏而不是删除库位."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -985,7 +985,7 @@ msgstr "请在列表视图中选择多个待合并的盘点"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr ""
+msgstr "确认分拣"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1011,13 +1011,13 @@ msgstr "左父项"
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "库存估价科目"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
 #, python-format
 msgid "is waiting."
-msgstr ""
+msgstr "正等待"
 
 #. module: stock
 #: constraint:product.product:0
@@ -1109,7 +1109,7 @@ msgstr "供应商"
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
-msgstr ""
+msgstr "为取消这个盘存，你必须要先取消相关的分录。"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1122,7 +1122,7 @@ msgstr "完成日期"
 msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
-msgstr ""
+msgstr "运输不允许您四舍五入这计量单位 \"%s %s\", ，只允许你对这个单位 \"%s %s\" 取整。"
 
 #. module: stock
 #: view:stock.move:0
@@ -1157,7 +1157,7 @@ msgstr "实物盘点"
 msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
-msgstr "公司的装箱单将包含连锁调拨(如果为空使用默认公司规则)"
+msgstr "公司的分拣单包含连锁调拨(如果为空使用默认的公司规则)"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1165,7 +1165,7 @@ msgid ""
 "Shipping Type of the Picking List that will contain the chained move (leave "
 "empty to automatically detect the type based on the source and destination "
 "locations)."
-msgstr "装箱单的运送类型将包含连锁调拨(为空根据源和目标库位自动检测)"
+msgstr "分拣单的运送类型将包含连锁调拨(为空根据源和目标库位自动检测)"
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1223,15 +1223,15 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"选择一个连库位的类型.\n"
-"\"自动调拨\"值将在创建库存调拨后将自动使当前库存值生效.\n"
-"\"手动操作\"库存调拨要手动确认生效.\n"
-"\"自动不增加步骤\"这库位取代调拨的源."
+"选择一个连锁库位的类型.\n"
+"\"自动调拨\"将在创建库存调拨后将自动审核。\n"
+"\"手动操作\"库存调拨要手动审核。\n"
+"\"自动但不增加\"这库位取代调拨的源库位。"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr "托盘标识"
+msgstr "包裹标识"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1241,7 +1241,7 @@ msgstr "分拣单列表："
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr "等待其他调拨"
+msgstr "等待其它调拨"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1254,14 +1254,14 @@ msgstr "对当前产品,这库位将作为默认的生产订单产生的库存�
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "预计的库存变化"
 
 #. module: stock
 #: help:stock.move,price_unit:0
 msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
-msgstr "字段用于记录这产品的成本,用户在确认装箱单时设置(用于在计算成本的平均价格)"
+msgstr "字段用于记录产品的成本，用户在确认分拣单时设置(用于在计算成本的平均价格)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1350
@@ -1274,7 +1274,7 @@ msgstr "处于草稿状态"
 msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
-msgstr "这列出了您所有托盘.当您选择一个托盘,您可以获取此其内的产品的上游和下游的追溯信息."
+msgstr "列出了您所有包裹，当您选择一个包裹时，您可以获取包裹中产品的上游和下游的追溯信息."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -1331,7 +1331,7 @@ msgstr "收货已处理"
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr "您只希望返回已确认,可用或已完成的装箱单!"
+msgstr "您可以返回已确认,可用或已完成的分拣单!"
 
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
@@ -1346,7 +1346,7 @@ msgstr "生产批次修订"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr "内部装箱单"
+msgstr "内部分拣单"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1362,7 +1362,7 @@ msgstr "拆分"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "搜索装箱单"
+msgstr "搜索分拣单"
 
 #. module: stock
 #: code:addons/stock/product.py:92
@@ -1378,7 +1378,7 @@ msgstr "类型"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "可用的分拣单"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
@@ -1388,7 +1388,7 @@ msgstr "一般IT供应商"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "接收"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1399,11 +1399,12 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"用于实时盘点估价。当设定虚拟库位（不是内部类型）时，在产品被移出这库位和移入内部库位时这科目将用于保存产品的值，代替一般的出库科目。对内部库位没影响。"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr "装箱单:"
+msgstr "分拣单"
 
 #. module: stock
 #: field:stock.inventory,date:0 field:stock.move,create_date:0
@@ -1424,7 +1425,7 @@ msgstr "客户或供应商地址"
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,picking_id:0
 msgid "Packing"
-msgstr "装箱单"
+msgstr "分拣单"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1437,18 +1438,18 @@ msgstr "客户库位"
 #: code:addons/stock/stock.py:2312
 #, python-format
 msgid "You can only delete draft moves."
-msgstr "您只可删除草稿调拨"
+msgstr "您只能删除草稿状态的调拨。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "盘点拆分明细"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "打印库位及子库位余额"
+msgstr "库位盘点总览"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1458,7 +1459,7 @@ msgstr "一般信息"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "分析包括未来的调拨（类似虚拟库存）"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1513,7 +1514,8 @@ msgstr ""
 "* 确认：产品可用仍在等待\n"
 "* 可用：备用产品，只待确认\n"
 "* 等待中：在自动变为可用状态前等待其它调拨 （比如：在“按订单生产”的流程中）\n"
-"* 完成：已处理完，不能修改或取消* 已取消：已被取消，不能再确认"
+"* 完成：已处理完，不能修改或取消\n"
+"* 已取消：已被取消，不能再确认"
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1554,9 +1556,9 @@ msgid ""
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
 "当创建的库存调拨状态为\"草稿\". \n"
-"如果在调度没找到产品,将设为\"不可用\"状态.\n"
+"如果在调度程序没找到产品,将设为\"不可用\"状态.\n"
 " 当产品被保留将设为\"可用\"状态.\n"
-"当完成装箱单状态是\"完成\". \n"
+"当完成分拣单状态是\"完成\". \n"
 "如果这调拨在等待其它东西状态为\"等待\"."
 
 #. module: stock
@@ -1576,7 +1578,7 @@ msgstr "已损耗"
 #: help:stock.partial.move.line,currency:0
 #: help:stock.partial.picking.line,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr "单位成本金额的币别"
+msgstr "单位成本的币别"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1589,7 +1591,7 @@ msgstr "9月"
 msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
-msgstr "如果这装箱单已被拆分这字段链接的装箱单包括的其它部分已被处理."
+msgstr "如果这分拣单已被拆分这字段链接的分拣单包括的其它部分已被处理."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1599,7 +1601,7 @@ msgstr "库存统计"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "月计划"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1609,12 +1611,12 @@ msgstr "追踪生产批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "是子单"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "库存估计科目（出库）"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1635,7 +1637,7 @@ msgstr "送货"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1655,7 +1657,7 @@ msgstr "已创建库存调拨"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "库存估价科目（入库）"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1670,7 +1672,7 @@ msgstr "跟踪批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr "退货单"
+msgstr "子单"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
@@ -1680,7 +1682,7 @@ msgstr "对应的库存属性"
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr "位置"
+msgstr "本地化"
 
 #. module: stock
 #: code:addons/stock/product.py:429
@@ -1706,12 +1708,12 @@ msgid ""
 "outgoing stock moves will be posted in this account, unless there is a "
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
-msgstr ""
+msgstr "在做实时盘点估价时，除非对目标库位指定一个估价科目否则出库调拨账簿分录将登入这个科目。当产品不设定时，它默认继承产品的类别的设定。"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "计划日期"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1775,7 +1777,7 @@ msgstr "损耗产品"
 #: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr "您不能删除状态为 %s 的装箱单!"
+msgstr "您不能删除状态为 %s 的分拣单!"
 
 #. module: stock
 #: view:stock.inventory.line.split:0 view:stock.move.consume:0
@@ -1787,7 +1789,7 @@ msgstr "取消"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "退货装箱单"
+msgstr "退回分拣单"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -1830,11 +1832,12 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"用于实时盘点估价。当设定在一个虚拟库位（而不是内部类型）这科目将用于记录从内部库位调拨产品的价值。代替这产品的一般出库科目。它不影响内部库位。"
 
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Provide the quantities of the returned products."
-msgstr "输入退货的数量"
+msgstr "输入子单的产品数量"
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -1849,7 +1852,7 @@ msgstr "盘点估值"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "今天计划订单"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1882,7 +1885,7 @@ msgstr "调拨分析让您轻松检查和分析您公司的库存调拨.在您�
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
-msgstr ""
+msgstr "不能创建该分录，因为产品的出库科目和该产品类别的估价科目相同。"
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -1915,7 +1918,7 @@ msgstr "批次跟踪库存报表"
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
-msgstr "这产品或它的分类 : \"%s\" (id: %d) 没定义入库科目"
+msgstr "该产品或它的类别 : \"%s\" (id: %d) 没定义入库科目"
 
 #. module: stock
 #: code:addons/stock/product.py:419
@@ -1959,7 +1962,7 @@ msgstr "库存"
 msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
-msgstr ""
+msgstr "这字段用于决定产品批次列是否显示在move_ids 。"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1967,7 +1970,7 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
-msgstr "在你盘点这产品时,这库存的库位将替代默认值作为库存调拨的源库位"
+msgstr "对当前的产品，在你盘点这产品时,这库位将代替默认值作为库存调拨的源库位"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -1987,7 +1990,7 @@ msgstr "物流货运单位：托盘、箱、包等"
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "客户库位"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2026,7 +2029,7 @@ msgstr "创建"
 #: view:report.stock.inventory:0
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
-msgstr ""
+msgstr "当前盘点分析（只调拨那些已处理的）"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
@@ -2055,12 +2058,12 @@ msgstr "仓库管理"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr "部分交付"
+msgstr "分批出货"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "自动，不加入步骤"
+msgstr "自动，但不增加"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2072,7 +2075,7 @@ msgstr "库存库位分析"
 msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
-msgstr "调拨日期: 直到调拨完成的日程表日期,这日期是调拨实际处理完的日期."
+msgstr "调拨日期: 安排的日期直到调拨完成的日期，这日期是调拨实际处理完成的日期."
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -2100,7 +2103,7 @@ msgstr "单据"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr "入库装箱单"
+msgstr "入库分拣单列表"
 
 #. module: stock
 #: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
@@ -2119,7 +2122,7 @@ msgstr "产品： "
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
-msgstr "为所有调拨包括这产品和生成的生产单强制指定一个生产批次."
+msgstr "为所有调拨包括（其生产单）强制指定一个生产批次."
 
 #. module: stock
 #: view:product.product:0
@@ -2229,13 +2232,13 @@ msgstr "系统存储成品的库位"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "要不要送货"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr "出仓单"
+msgstr "出仓产品"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 5a90c20aa81..1c229121e1c 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -9,15 +9,14 @@
         <field name="name">res.partner.stock.property.form.inherit</field>
         <field name="model">res.partner</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="inherit_id" ref="product.view_partner_property_form"/>
         <field name="arch" type="xml">
-            <page string="Sales &amp; Purchases" position="inside">
-                <group colspan="2" col="2" groups="stock.group_locations">
-                    <separator string="Inventory Properties" colspan="2"/>
+            <group name="pricelists" position="after">
+                <group groups="stock.group_locations">
                     <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
                     <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
                 </group>
-            </page>
+            </group>
         </field>
     </record>
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 135c2c79fa4..63d22f4fab8 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -202,7 +202,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store" groups="stock.group_locations">
+                    <group name="store" groups="stock.group_locations">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index de3e91ee183..77bf887c13d 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -12,32 +12,30 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Traceability" colspan="4"/>
-                            <field name="group_stock_production_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                            <newline/>
-                            <field name="group_stock_tracking_lot"/>
+                    <group col="4">
+                        <separator string="Traceability" colspan="4"/>
+                        <field name="group_stock_production_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        <newline/>
+                        <field name="group_stock_tracking_lot"/>
 
-                            <separator string="Logistics" colspan="4"/>
-                            <field name="group_stock_multiple_locations"/>
-                            <field name="module_stock_location"/>
-                            <field name="module_stock_invoice_directly"/>
-                            <field name="decimal_precision"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="group_stock_multiple_locations"/>
+                        <field name="module_stock_location"/>
+                        <field name="module_stock_invoice_directly"/>
+                        <field name="decimal_precision"/>
 
-                            <separator string="Products" colspan="4"/>
-                            <field name="group_stock_packaging"/>
-                            <field name="group_stock_inventory_valuation"/>
-                            <field name="group_uom"/>
-                            <field name="group_uos"/>
-                            <field name="group_product_variant"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="group_stock_packaging"/>
+                        <field name="group_stock_inventory_valuation"/>
+                        <field name="group_uom"/>
+                        <field name="group_uos"/>
+                        <field name="group_product_variant"/>
 
-                            <separator string="Partners" colspan="4"/>
-                            <field name="module_claim_from_delivery"/>
-                        </group>
-                    </sheet>
+                        <separator string="Partners" colspan="4"/>
+                        <field name="module_claim_from_delivery"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index baa446b6ef7..ec7f24db789 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -851,16 +851,20 @@
                             </field>
                         </page>
                         <page string="Additional info">
-                            <group col="4">
-                                <field name="auto_picking"/>
-                                <field name="date_done"/>
-                                <field name="move_type"/>
-                                <field name="type"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group>
+                                    <field name="move_type"/>
+                                    <field name="type"/>
+                                    <field name="auto_picking"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="date_done"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e0b21ff20b2..cb850d8123f 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -302,150 +302,152 @@
             <field name="model">survey.page</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Page">
-                    <field name="title" colspan="4" select="1"/>
-                    <field name="survey_id" select="1"/>
-                    <field name="sequence"/>
-                    <separator string="Description" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                    <field name="question_ids" colspan="4" nolabel="1">
-                    <form string="Survey Question">
-                        <field name="question" colspan="4" select="1"/>
+                <form string="Survey Page" version="7.0">
+                    <sheet>
+                        <field name="title" colspan="4" select="1"/>
+                        <field name="survey_id" select="1"/>
                         <field name="sequence"/>
-                        <field name="tot_resp"/>
-                        <field name="type" on_change="on_change_type(type)"/>
-                        <field name="in_visible_rating_weight" invisible="1"/>
-                        <field name="in_visible_menu_choice" invisible="1"/>
-                        <field name="in_visible_answer_type" invisible="1"/>
-                        <notebook colspan="4">
-                            <page string="Options">
-                                <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                  <separator string="Answer" colspan="4"/>
-                                   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                       <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                   </group>
-                                   <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                       <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                           <field name="no_of_rows"/>
-                                        </group>
-                                   </group>
-                                </group>
-                                <newline/>
-                                <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                    <separator string="Comment Field" colspan="4"/>
-                                    <group colspan="4">
-                                        <field name="is_comment_require"/>
-                                    </group>
-                                    <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                        <group col="4" colspan="4">
-                                            <field name="comment_field_type" colspan="1"/>
-                                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field colspan="2" name="comment_label" />
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="question_ids" colspan="4" nolabel="1">
+                        <form string="Survey Question">
+                            <field name="question" colspan="4" select="1"/>
+                            <field name="sequence"/>
+                            <field name="tot_resp"/>
+                            <field name="type" on_change="on_change_type(type)"/>
+                            <field name="in_visible_rating_weight" invisible="1"/>
+                            <field name="in_visible_menu_choice" invisible="1"/>
+                            <field name="in_visible_answer_type" invisible="1"/>
+                            <notebook colspan="4">
+                                <page string="Options">
+                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                                      <separator string="Answer" colspan="4"/>
+                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                       </group>
+                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                               <field name="no_of_rows"/>
                                             </group>
+                                       </group>
+                                    </group>
+                                    <newline/>
+                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                        <separator string="Comment Field" colspan="4"/>
+                                        <group colspan="4">
+                                            <field name="is_comment_require"/>
                                         </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                            <field name="comment_valid_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                <field name="comment_minimum_no" string="Between"/>
-                                                <field name="comment_maximum_no" string="and"/>
+                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                            <group col="4" colspan="4">
+                                                <field name="comment_field_type" colspan="1"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                    <field colspan="2" name="comment_label" />
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                <field name="comment_minimum_float" string="Between"/>
-                                                <field name="comment_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                <field name="comment_minimum_date" string="Between"/>
-                                                <field name="comment_maximum_date" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                <field name="comment_valid_type" colspan="2"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                    <field name="comment_minimum_no" string="Between"/>
+                                                    <field name="comment_maximum_no" string="and"/>
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                    <field name="comment_minimum_float" string="Between"/>
+                                                    <field name="comment_maximum_float" string="and"/>
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                    <field name="comment_minimum_date" string="Between"/>
+                                                    <field name="comment_maximum_date" string="and"/>
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                </group>
                                             </group>
                                         </group>
                                     </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                    <field name="comment_column"/>
-                                    <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                        <field name="column_name" colspan="2"/>
-                                    </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                    <separator string="Validation" colspan="4"/>
-                                    <group colspan="4">
-                                        <field name="is_validation_require"/>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                        <field name="comment_column"/>
+                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                            <field name="column_name" colspan="2"/>
+                                        </group>
                                     </group>
-                                    <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                        <field name="validation_type" colspan="2"/>
-                                        <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                            <field name="validation_minimum_no" string="Between"/>
-                                            <field name="validation_maximum_no" string="and"/>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                        <separator string="Validation" colspan="4"/>
+                                        <group colspan="4">
+                                            <field name="is_validation_require"/>
                                         </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                            <field name="validation_minimum_float" string="Between"/>
-                                            <field name="validation_maximum_float" string="and"/>
+                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                            <field name="validation_type" colspan="2"/>
+                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                <field name="validation_minimum_no" string="Between"/>
+                                                <field name="validation_maximum_no" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                <field name="validation_minimum_float" string="Between"/>
+                                                <field name="validation_maximum_float" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                <field name="validation_minimum_date" string="Between"/>
+                                                <field name="validation_maximum_date" string="and"/>
+                                            </group>
                                         </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                            <field name="validation_minimum_date" string="Between"/>
-                                            <field name="validation_maximum_date" string="and"/>
+                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
                                         </group>
                                     </group>
-                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                        <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                    </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                    <separator string="Required Answer" colspan="4"/>
                                     <newline/>
-                                    <field name="is_require_answer"/>
-                                    <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                            <field name="required_type"/>
-                                            <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                <field name="req_ans" />
+                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                        <separator string="Required Answer" colspan="4"/>
+                                        <newline/>
+                                        <field name="is_require_answer"/>
+                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <field name="required_type"/>
+                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                    <field name="req_ans" />
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                    <field name="minimum_req_ans"/>
+                                                    <field name="maximum_req_ans"/>
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                <field name="minimum_req_ans"/>
-                                                <field name="maximum_req_ans"/>
+                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                <label string="When the question is not answered, display this error message:"/>
+                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
                                             </group>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                            <label string="When the question is not answered, display this error message:"/>
-                                            <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                            <group colspan="2" >
-                                                <field name="numeric_required_sum"/>
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                <group colspan="2" >
+                                                    <field name="numeric_required_sum"/>
+                                                </group>
+                                                <newline/>
+                                                <label string="When the choices do not add up correctly, display this error message"/>
+                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                <field name="rating_allow_one_column_require"/>
                                             </group>
-                                            <newline/>
-                                            <label string="When the choices do not add up correctly, display this error message"/>
-                                            <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                            <field name="rating_allow_one_column_require"/>
                                         </group>
                                     </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                    <separator string="Descriptive Text" colspan="4"/>
-                                    <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                </group>
-                            </page>
-                        </notebook>
-
-                    </form>
-                    <tree string="Survey Question">
-                        <field name="sequence" string="Seq"/>
-                        <field name="question" colspan="4" select="1"/>
-                        <field name="answer_choice_ids"/>
-                    </tree>
-                    </field>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                        <separator string="Descriptive Text" colspan="4"/>
+                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                    </group>
+                                </page>
+                            </notebook>
+    
+                        </form>
+                        <tree string="Survey Question">
+                            <field name="sequence" string="Seq"/>
+                            <field name="question" colspan="4" select="1"/>
+                            <field name="answer_choice_ids"/>
+                        </tree>
+                        </field>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index c10890d3928..1dc8b4cdb1f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -30,7 +30,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki Groups">
+                <form string="Wiki Groups" version="7.0">
                     <group col="4" colspan="3" >
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
@@ -41,17 +41,18 @@
                             attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
-                    <page string="Notes">
-                        <separator string="Group Description" colspan="4"/>
-                        <field name="notes" colspan="4" nolabel="1"/>
-                    </page><page string="Configuration">
-                        <separator string="Page Template" colspan="4"/>
-                        <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
-                    </page>
+                        <page string="Notes">
+                            <separator string="Group Description" colspan="4"/>
+                            <field name="notes" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Configuration">
+                            <separator string="Page Template" colspan="4"/>
+                            <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
+                        </page>
                     </notebook>
                      <field name="menu_id"/>
                      <button
-                         name="%(wiki.action_wiki_create_menu)d"
+                        name="%(wiki.action_wiki_create_menu)d"
                          string="Create Menu"
                           type="action"
                           icon="gtk-justify-fill"
@@ -126,30 +127,32 @@
             <field name="model">wiki.wiki</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="6"/>
-                        <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="parent_id" domain="[('group_id','=',group_id)]"/>
-                        <field name="section"/>                        
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Content">
-                        <separator colspan="4" string="Page Content"/>
-                        <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
-                        </page>
-                    </notebook>
-                    <group col="2" colspan="2" groups="base.group_no_one">
-                        <separator colspan="4" string="Modification Information"/>
-                        <field name="write_date" readonly="1"/>
-                        <field name="minor_edit"/>
-                        <field name="review" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Meta Information"/>
-                        <field name="tags" select="1"/>
-                        <field name="toc" groups="base.group_no_one"/>
-                    </group>
+                <form string="Wiki" version="7.0">
+                    <sheet>
+                        <group col="6" colspan="4">
+                            <field name="name" select="1" colspan="6"/>
+                            <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
+                            <field name="parent_id" domain="[('group_id','=',group_id)]"/>
+                            <field name="section"/>                        
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Content">
+                            <separator colspan="4" string="Page Content"/>
+                            <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
+                            </page>
+                        </notebook>
+                        <group col="2" colspan="2" groups="base.group_no_one">
+                            <separator colspan="4" string="Modification Information"/>
+                            <field name="write_date" readonly="1"/>
+                            <field name="minor_edit"/>
+                            <field name="review" select="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="4" string="Meta Information"/>
+                            <field name="tags" select="1"/>
+                            <field name="toc" groups="base.group_no_one"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -227,12 +230,14 @@
             <field name="model">wiki.wiki.history</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki History">
-                    <field name="wiki_id" select="1" colspan="4"/>
-                    <field name="summary" select="1" colspan="4"/>
-                    <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
-                    <field name="create_date" select="1" readonly="1"/>
-                    <field name="minor_edit" select="1" groups="base.group_no_one"/>
+                <form string="Wiki History" version="7.0">
+                    <sheet>
+                        <field name="wiki_id" select="1" colspan="4"/>
+                        <field name="summary" select="1" colspan="4"/>
+                        <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
+                        <field name="create_date" select="1" readonly="1"/>
+                        <field name="minor_edit" select="1" groups="base.group_no_one"/>
+                    </sheet>
                 </form>
             </field>
         </record>