From 0347a93cda49a84dfec96059a42e279b3722bf69 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 5 Jul 2012 18:12:33 +0530
Subject: [PATCH] [FIX]: IMprovement in view. duration field also.

bzr revid: atp@tinyerp.com-20120705124233-6jchsxi9m6pvqvtr
---
 addons/account/account_invoice_view.xml       |  7 +++--
 addons/account_budget/account_budget_view.xml |  4 +--
 .../account_payment/account_payment_view.xml  |  4 +--
 .../account_voucher/account_voucher_view.xml  | 25 ++++++++---------
 .../voucher_sales_purchase_view.xml           | 28 +++++++++----------
 .../analytic_contract_project_view.xml        |  2 +-
 addons/l10n_ch/wizard/bvr_import_view.xml     |  4 +--
 .../point_of_sale/account_statement_view.xml  |  2 +-
 8 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46d3412f3b2..d4b8eac6750 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -51,7 +51,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group>
-                    	<group>
+                        <group>
                           <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                           <field name="name"/>
                           <label string="Quantity" for="quantity" align="1.0"/>
@@ -190,7 +190,7 @@
                           <field name="fiscal_position" widget="selection"/>
                           <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
                                  groups="account.group_account_user"/>
-                         <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
+                          <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                  name="account_id" groups="account.group_account_user"/>
                           <field name="currency_id"/>
                           <field name="type" invisible="1"/>
@@ -227,10 +227,10 @@
                                             <field name="factor_tax" invisible="True"/>
                                         </tree>
                                     </field>
-                                    <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
+                                    <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
                                     <field name="residual" style="margin-top: 10px"/>
@@ -363,6 +363,7 @@
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
+                                     <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 86e7cf3219d..59ae6364ce2 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -156,9 +156,9 @@
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from"/>
+                                                    <field name="date_from" class="oe_inline"/>
                                                      <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
-                                                    <field name="date_to"/>
+                                                    <field name="date_to" class="oe_inline"/>
                                                 </div>
                                             </group>
                                             <group>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a57721d9657..29da4c12e06 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -334,9 +334,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
+                <xpath expr="//button[@string='Import Invoices']" position="before">
                     <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
-                </xpath>      
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a53482cf176..383abe92ddc 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -85,23 +85,22 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                             <group>
-                             <group>
-                                <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                             </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
+                            <group>
+                               <group>
+                                  <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
+                               </group>
+                               <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
                                    <group>
-                                     <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                       <label for="tax_id"/>
+                                       <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                       <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
                                    </group>
                                    <group>
-                                   <field name="amount_untaxed" readonly="1"/>
-                                     <field name="tax_amount" readonly="1"/>
-                                     <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                            <field name="amount_untaxed"/>
+                                            <field name="tax_amount" readonly="1" />
+                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
                                    </group>
-                              </group>
-                              <group>
-                                   <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                              </group>
+                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1c2fb977ea6..61c938e070e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -131,23 +131,21 @@
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer oe_right">
-                                  <group>
-                                     <field name="tax_id"
-                                      on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                      widget="selection"
-                                      domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                  </group>
-                                  <group>
-                                       <field name="amount_untaxed"/>
-                                       <field name="tax_amount" readonly="1"/>
-                                       <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    <group>
+                                        <label for="tax_id"/>
+                                        <field name="tax_id"
+                                           on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                           widget="selection"
+                                           nolabel="1"
+                                           domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <button type="object" colspan="2" name="compute_tax" icon="terp-stock_format-scientific" string="Compute Tax" class="oe_inline oe_left" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>
+                                    <group>
+                                            <field name="amount_untaxed"/>
+                                            <field name="tax_amount" readonly="1" />
+                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
                                     </group>
                                 </group>
-                               <group>
-                                  <button type="object"
-                                        icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                         attrs="{'invisible': [('state','!=','draft')]}"/>
-                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 0e61fe08d01..49f5738df59 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -15,7 +15,7 @@
                             <group string="Validity">
                                 <label for="date_start" string="Duration"/>
                                 <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                    <field name="date_start" class="oe_inline"/>  <span  attrs="{'invisible':[('date','=',False)]}" class="oe_inline"> - </span> <field name="date" class="oe_inline"/>
                                 </div>
                                 <label for="quantity_max"/>
                                 <div>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 0fd445f71bc..e9dab515bf8 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -34,9 +34,9 @@
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
+                <xpath expr="//button[@string='Import Invoices']" position="after">
                     <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
                 </xpath>
             </field>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index c67fcd0e9fe..e5baaca393d 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -105,7 +105,7 @@
             <field name="inherit_id" ref="account.view_cash_statement_tree"/>
             <field name="arch" type="xml">
                 <field name="journal_id" position="after">
-                    <field name="user_id"/>
+                    <field name="user_id" string="Responsible"/>
                 </field>
             </field>
         </record>