From 92e005720f51043a18771e21d5c5326a505302a4 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 17 Dec 2015 16:47:34 +0100 Subject: [PATCH 1/3] set date_validty to proper value on copy() Convert class names to camelcase --- sale_validity/model/company.py | 2 +- sale_validity/model/sale_order.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sale_validity/model/company.py b/sale_validity/model/company.py index cd554b0a60c..643c5271a37 100644 --- a/sale_validity/model/company.py +++ b/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 = { diff --git a/sale_validity/model/sale_order.py b/sale_validity/model/sale_order.py index 3b29145b678..7526c36dab3 100644 --- a/sale_validity/model/sale_order.py +++ b/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 + it's 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): From 49d5fc87412885bece259fdfc49c495c1616908e Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 17 Dec 2015 17:39:56 +0100 Subject: [PATCH 2/3] English mistake --- sale_validity/model/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_validity/model/sale_order.py b/sale_validity/model/sale_order.py index 7526c36dab3..eb5e8edbc4d 100644 --- a/sale_validity/model/sale_order.py +++ b/sale_validity/model/sale_order.py @@ -63,7 +63,7 @@ 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 - it's default value on copy() + its default value on copy() ''' if default is None: default = {} From f65056d059bc430c7a42564cf49acdf5213e3173 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 18 Dec 2015 10:41:30 +0100 Subject: [PATCH 3/3] Double quotes for docstring --- sale_validity/model/sale_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale_validity/model/sale_order.py b/sale_validity/model/sale_order.py index eb5e8edbc4d..e569d073bf6 100644 --- a/sale_validity/model/sale_order.py +++ b/sale_validity/model/sale_order.py @@ -60,11 +60,11 @@ def _default_date_validity(self, cr, uid, context=None): } 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(