[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-payment-order-shp

bzr revid: atp@tinyerp.com-20120702162303-dnik902ltij5uoog

addons/account/account_view.xml

@@ -104,15 +104,16 @@
                     <field name="state" widget="statusbar" nolabel="1"/>
                 </header>
                 <sheet>
-                    <group>
+                    <group col="4">
                         <group>
                             <field name="name"/>
                             <field name="fiscalyear_id" widget="selection"/>
-                            <label for="date_start" string="Duration"/>
+                            <label for="date_start" string="Duration" />
                             <div>
-                                <field name="date_start"/> - 
-                                <field name="date_stop" nolabel="1"/>
-                            </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>
                             <field name="code"/>

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'),

addons/account_followup/wizard/account_followup_print_view.xml

@@ -14,7 +14,6 @@
                     or
                     <button string="Cancel" class="oe_link" special="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"/>

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'),