From fafc132188088e87a5c51335adb5628ad0a5568f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Sun, 26 Jan 2014 00:08:47 +0100
Subject: [PATCH] [IMP] website_quotation -> website_quote
bzr revid: fp@tinyerp.com-20140125230847-qzls5kjbxj51scze
---
addons/sale/res_config.py | 2 +-
addons/sale/res_config_view.xml | 6 ++---
addons/website_quotation/controllers/main.py | 4 +--
.../data/website_quotation_demo.xml | 8 +++---
.../views/website_quotation.xml | 26 +++++++++----------
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index a595671d460..f498622b868 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -93,7 +93,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
help='This adds the \'Margin\' on sales order.\n'
'This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n'
'-This installs the module sale_margin.'),
- 'module_website_quotation': fields.boolean("Allow online quotations and templates",
+ 'module_website_quote': fields.boolean("Allow online quotations and templates",
help='This adds the online quotation'),
'module_sale_journal': fields.boolean("Allow batch invoicing of delivery orders through journals",
help='Allows you to categorize your sales and deliveries (picking lists) between different journals, '
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 34f05226a30..641b161cbda 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -80,9 +80,9 @@
-
-
-
+
+
+
diff --git a/addons/website_quotation/controllers/main.py b/addons/website_quotation/controllers/main.py
index e1fad33e039..2176e81a3b0 100644
--- a/addons/website_quotation/controllers/main.py
+++ b/addons/website_quotation/controllers/main.py
@@ -57,7 +57,7 @@ class sale_quote(http.Controller):
'order_valid': (not order.validity_date) or (now <= order.validity_date),
'days_valid': max(days, 0)
}
- return request.website.render('website_quotation.so_quotation', values)
+ return request.website.render('website_quote.so_quotation', values)
@http.route(['/quote/accept'], type='json', auth="public", website=True)
def accept(self, order_id=None, token=None, signer=None, sign=None, **post):
@@ -133,7 +133,7 @@ class sale_quote(http.Controller):
@http.route(["/quote/template/"], type='http', auth="user", website=True)
def template_view(self, quote, **post):
values = { 'template': quote }
- return request.website.render('website_quotation.so_template', values)
+ return request.website.render('website_quote.so_template', values)
@http.route(["/quote/add_line///"], type='http', auth="public", website=True)
def add(self, option_id, order_id, token, **post):
diff --git a/addons/website_quotation/data/website_quotation_demo.xml b/addons/website_quotation/data/website_quotation_demo.xml
index bfec1604283..24c5f08538c 100644
--- a/addons/website_quotation/data/website_quotation_demo.xml
+++ b/addons/website_quotation/data/website_quotation_demo.xml
@@ -163,7 +163,7 @@
-
+
@@ -184,7 +184,7 @@
-
+
@@ -205,7 +205,7 @@
-
+
@@ -226,7 +226,7 @@
Test developments automatically
-
+
diff --git a/addons/website_quotation/views/website_quotation.xml b/addons/website_quotation/views/website_quotation.xml
index 7378c7447b9..0374bfbc311 100644
--- a/addons/website_quotation/views/website_quotation.xml
+++ b/addons/website_quotation/views/website_quotation.xml
@@ -85,14 +85,14 @@
-
+
-
+
@@ -130,7 +130,7 @@
-
-
+
@@ -365,13 +365,13 @@
-
+
-
+
-
+
@@ -388,7 +388,7 @@
-
+
@@ -458,8 +458,8 @@
-
-
+
+