Merge f65056d into c8b7392

sale_validity/model/company.py

@@ -22,7 +22,7 @@
 from openerp.osv import fields, orm
 
 
-class res_company(orm.Model):
+class ResCompany(orm.Model):
     _inherit = "res.company"
 
     _columns = {

sale_validity/model/sale_order.py

@@ -24,7 +24,7 @@
 from dateutil.relativedelta import relativedelta
 
 
-class sale_order(orm.Model):
+class SaleOrder(orm.Model):
     _inherit = "sale.order"
 
     _columns = {
@@ -59,6 +59,19 @@ def _default_date_validity(self, cr, uid, context=None):
         'date_validity': _default_date_validity,
     }
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        """
+        By default, date_order is set to today on copy()
+        cf addons/sale/sale.py. So we set date_validity to
+        its default value on copy()
+        """
+        if default is None:
+            default = {}
+        default['date_validity'] = self._default_date_validity(
+            cr, uid, context=context)
+        return super(SaleOrder, self).copy(
+            cr, uid, id, default=default, context=context)
+
     def date_order_change(
             self, cr, uid, ids, date_order, date_validity, company_id,
             context=None):