Merge lp:~yann-papouin/openobject-addons/6.1-bug-1094315-saleorder-requested-date into lp:openobject-addons/6.1

[Yann Papouin]

=== modified file 'sale_order_dates/sale_order_dates.py'
--- sale_order_dates/sale_order_dates.py	2011-07-01 23:41:24 +0000
+++ sale_order_dates/sale_order_dates.py	2013-09-10 12:23:16 +0000
@@ -26,6 +26,12 @@
 
 class sale_order_dates(osv.osv):
     _inherit = 'sale.order'
+    
+    def _get_date_planned(self, cr, uid, order, line, start_date, context=None):
+        result = super(sale_order, self)._get_date_planned(cr, uid, order, line, start_date, context=context)
+        if order.requested_date and (order.requested_date > result):
+            result = order.requested_date        
+        return result
 
     def _get_effective_date(self, cr, uid, ids, name, arg, context=None):
         res = {}