From 42c17129c3219ed143c5a9b24fa0bb50bf7328cb Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Mon, 4 May 2015 13:38:34 +0200 Subject: [PATCH] [IMP] sale,sale_stock : Uniformize the naming in the reports with model sale.order --- addons/sale/report/sale_report.py | 6 +++--- addons/sale_stock/report/sale_report.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 69d0c53de64..a06c58b7be9 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -44,11 +44,11 @@ class sale_report(osv.osv): 'categ_id': fields.many2one('product.category','Product Category', readonly=True), 'nbr': fields.integer('# of Lines', readonly=True), # TDE FIXME master: rename into nbr_lines 'state': fields.selection([ - ('draft', 'Quotation'), + ('draft', 'Draft Quotation'), ('sent', 'Quotation Sent'), ('waiting_date', 'Waiting Schedule'), - ('manual', 'Manual In Progress'), - ('progress', 'In Progress'), + ('manual', 'Sale to Invoice'), + ('progress', 'Sale Order'), ('invoice_except', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled') diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py index 42ca6e44ea8..7a7f4a415f5 100644 --- a/addons/sale_stock/report/sale_report.py +++ b/addons/sale_stock/report/sale_report.py @@ -29,11 +29,11 @@ class sale_report(osv.osv): 'shipped_qty_1': fields.integer('# of Shipped Lines', readonly=True), 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',readonly=True), 'state': fields.selection([ - ('draft', 'Quotation'), + ('draft', 'Draft Quotation'), ('sent', 'Quotation Sent'), ('waiting_date', 'Waiting Schedule'), - ('manual', 'Manual In Progress'), - ('progress', 'In Progress'), + ('manual', 'Sale to Invoice'), + ('progress', 'Sale Order'), ('shipping_except', 'Shipping Exception'), ('invoice_except', 'Invoice Exception'), ('done', 'Done'),