From 6f8990949664280f5b44cda5cb6b15a857d352c6 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 2 Jul 2012 18:55:40 +0530
Subject: [PATCH] [IMP] improve payment order

bzr revid: shp@tinyerp.com-20120702132540-p29np5fsy0hzdtvp
---
 addons/account/account_view.xml                   | 15 ++++++++++-----
 addons/account_asset/account_asset.py             |  2 +-
 .../wizard/account_followup_print_view.xml        |  1 -
 addons/account_payment/account_payment.py         |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8b294690a79..d2568fe1717 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -108,11 +108,6 @@
                         <group>
                             <field name="name"/>
                             <field name="fiscalyear_id" widget="selection"/>
-                            <label for="date_start" string="Duration"/>
-                            <div>
-                                <field name="date_start"/> - 
-                                <field name="date_stop" nolabel="1"/>
-                            </div>
                         </group>
                         <group>
                             <field name="code"/>
@@ -120,6 +115,16 @@
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                     </group>
+					<group>
+                          <group>
+                            <label for="date_start" string="Duration" />
+                            <div>
+                               <field name="date_start" class="oe_inline" nolabel="1"/> 
+                                <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
+                                <field name="date_stop" nolabel="1" class="oe_inline"/>
+                             </div>
+                            </group>
+					</group>
                 </sheet>
                 </form>
             </field>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 32019ed31fe..e491b858286 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -345,7 +345,7 @@ class account_asset_depreciation_line(osv.osv):
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
         'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount To Depreciate', required=True),
+        'remaining_value': fields.float('Amount to Depreciate', required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 01bfcf62e79..f3701c34200 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -13,7 +13,6 @@
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
-                <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 02d12a534db..22b7fc5f6f2 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -98,7 +98,7 @@ class payment_order(osv.osv):
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
         'total': fields.function(_total, string="Total", type='float'),
-        'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
             ('due', 'Due date'),