diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml index 243004869e3..a61120c4216 100644 --- a/addons/sale/views/report_saleorder.xml +++ b/addons/sale/views/report_saleorder.xml @@ -31,7 +31,7 @@ -
+
Your Reference:

@@ -45,10 +45,6 @@ Salesperson:

-
- Validity Date: -

-

Payment Term:

diff --git a/addons/website_quote/__openerp__.py b/addons/website_quote/__openerp__.py index 3991f6ac17e..79e2c818aef 100644 --- a/addons/website_quote/__openerp__.py +++ b/addons/website_quote/__openerp__.py @@ -13,6 +13,7 @@ OpenERP Sale Quote Roller 'data': [ 'views/website_quotation.xml', 'views/website_quotation_backend.xml', + 'views/report_saleorder.xml', 'data/website_quotation_data.xml', 'security/ir.model.access.csv', ], diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py index c031baf7632..b19614410b5 100644 --- a/addons/website_quote/models/order.py +++ b/addons/website_quote/models/order.py @@ -114,7 +114,7 @@ class sale_order(osv.osv): 'template_id': fields.many2one('sale.quote.template', 'Quote Template'), 'website_description': fields.html('Description'), 'options' : fields.one2many('sale.order.option', 'order_id', 'Optional Products Lines'), - 'validity_date': fields.date('Validity Date'), + 'validity_date': fields.date('Expiry Date'), 'amount_undiscounted': fields.function(_get_total, string='Amount Before Discount', type="float", digits_compute=dp.get_precision('Account')) } diff --git a/addons/website_quote/views/report_saleorder.xml b/addons/website_quote/views/report_saleorder.xml new file mode 100644 index 00000000000..e85a48f9d22 --- /dev/null +++ b/addons/website_quote/views/report_saleorder.xml @@ -0,0 +1,13 @@ + + + + + +