diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 718a81d5c77..1c0596ddf96 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -268,6 +268,18 @@ class payment_line(osv.osv):
         else:
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
 
+    def _get_date(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        date = False
+        if context.get('order_id') and context['order_id']:
+            order = self.pool.get('payment.order').browse(cr, uid, context['order_id'], context)
+            if order.date_prefered == 'fixed':
+                date = order.date_scheduled
+            else:
+                date = time.strftime('%Y-%m-%d')
+        return date
+
     def _get_ml_inv_ref(self, cr, uid, ids, *a):
         res={}
         for id in self.browse(cr, uid, ids):
@@ -328,6 +340,7 @@ class payment_line(osv.osv):
         'state': lambda *args: 'normal',
         'currency': _get_currency,
         'company_currency': _get_currency,
+        'date': _get_date,
     }
     _sql_constraints = [
         ('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 93ba4b85de0..c15e2a59728 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -88,7 +88,7 @@
                       <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
                       <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     </group>
-                    <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
+                    <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1" default_get="{'order_id': active_id}" >
                         <form string="Payment Line">
                             <notebook>
                                 <page string="Payment">