From ed9f8fdbb4e78cd698448951e83729b2c84ed4c9 Mon Sep 17 00:00:00 2001 From: Nandan Jani Date: Tue, 14 Oct 2014 15:14:08 +0530 Subject: [PATCH] [IMP] website_quote: allow the user to print web quotation to pdf. This required to add col-xs-XX class on snippets, extract SaleOrder Content into a new template to create the report to print. The hidden-print class has been added into rendering report style, since wkhtmltopdf don't really support media-print CSS class. Conflicts: addons/website_quote/data/website_quotation_demo.xml --- addons/website/views/snippets.xml | 92 ++++----- addons/website_quote/__openerp__.py | 2 + addons/website_quote/controllers/main.py | 7 +- .../data/website_quotation_data.xml | 8 +- .../data/website_quotation_demo.xml | 75 +++---- addons/website_quote/quotation_report.xml | 14 ++ .../website_quote/views/report_quotation.xml | 18 ++ .../website_quote/views/website_quotation.xml | 194 ++++++++++-------- addons/website_report/views/layouts.xml | 10 +- 9 files changed, 246 insertions(+), 174 deletions(-) create mode 100644 addons/website_quote/quotation_report.xml create mode 100644 addons/website_quote/views/report_quotation.xml diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index fe3c0f36062..5cf5e7b842d 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -12,7 +12,7 @@
-
+

Your Banner Title

Click to customize this text

@@ -35,7 +35,7 @@

-
+

A Section Subtitle

Write one or two paragraphs describing your product or @@ -46,7 +46,7 @@ and give it to them.

-
+
Odoo text and image block
@@ -58,10 +58,10 @@
-
+
Odoo image and text block
-
+

A Section Subtitle

Write one or two paragraphs describing your product, @@ -81,7 +81,7 @@

-
+
Odoo Members @@ -140,13 +140,13 @@
-
+

A Great Headline

A good subtitle

-
+

A great way to catch your reader's attention is to tell a story. Everything you consider writing can be told as a story. @@ -173,7 +173,7 @@

-
+

Your Website Title

And a great subtitle too

@@ -186,17 +186,17 @@
-
+

First Feature

Tell what's the value for the
customer for this feature.

-
+

Second Feature

Write what the customer would like to know,
not what you want to show.

-
+

Third Feature

A small explanation of this great
feature, in clear words.

@@ -210,13 +210,13 @@
-
+

A Punchy Headline

-
+
Odoo CMS - a big picture
-
+

A Small Subtitle

@@ -238,7 +238,7 @@
-
+
Odoo - Sample 1 for three columns

Feature One

@@ -247,7 +247,7 @@ column and use the top icons to perform your action.

-
+
Odoo - Sample 2 for three columns

Feature Two

@@ -257,7 +257,7 @@ one as a copy.

-
+
Odoo - Sample 3 for three columns

Feature Three

@@ -345,12 +345,12 @@

-
+

Our Offers

-
+
@@ -379,7 +379,7 @@
-
+
@@ -408,7 +408,7 @@
-
+
@@ -447,14 +447,14 @@
-
+

50,000+ companies run Odoo to grow their businesses.

Join us and make your company a better place.

-
+
Contact Us Now @@ -511,7 +511,7 @@
-
+

Our References

@@ -519,7 +519,7 @@ More than 500 happy customers.
-
+

Write a quote here from one of your customers. Quotes are a @@ -528,7 +528,7 @@ Author of this quote

-
+

Odoo provides essential platform for our project management. @@ -537,19 +537,19 @@ John Doe, CEO

-
+
OpenERP logo
-
+
OpenERP logo
-
+
OpenERP logo
-
+
OpenERP logo
-
+
OpenERP logo
@@ -610,43 +610,43 @@
-
+

List of Features

Add a great slogan

-
+

Change Icons

Click on the icon to adapt it to your feature

-
+

Duplicate

Duplicate blocks to add more features.

-
+

Delete Blocks

Select and delete blocks to remove some features.

-
+

Second List

Add a great slogan

-
+

Great Value

Tell features the visitor would like to know, not what you'd like to say.

-
+

Change Background

From the main container, you can change the background to highlight features.

-
+

Sample images

All these icons are licensed under creative commons so that you can use them.

@@ -872,7 +872,7 @@
- + - +
  • Change...
    • @@ -1067,4 +1067,4 @@ - + \ No newline at end of file diff --git a/addons/website_quote/__openerp__.py b/addons/website_quote/__openerp__.py index d5afa11ce78..35c35ff5fb6 100644 --- a/addons/website_quote/__openerp__.py +++ b/addons/website_quote/__openerp__.py @@ -12,9 +12,11 @@ OpenERP Sale Quote Roller 'author': 'OpenERP SA', 'depends': ['website', 'sale', 'mail', 'web_tip'], 'data': [ + 'quotation_report.xml', 'views/website_quotation.xml', 'views/website_quotation_backend.xml', 'views/report_saleorder.xml', + 'views/report_quotation.xml', 'data/website_quotation_data.xml', 'security/ir.model.access.csv', 'data/quotation_tip_data.xml', diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py index 6c51dd0febc..c15431b9b2b 100644 --- a/addons/website_quote/controllers/main.py +++ b/addons/website_quote/controllers/main.py @@ -33,7 +33,7 @@ class sale_quote(http.Controller): "/quote/", "/quote//" ], type='http', auth="public", website=True) - def view(self, order_id, token=None, message=False, **post): + def view(self, order_id, pdf=None, token=None, message=False, **post): # use SUPERUSER_ID allow to access/view order for public user # only if he knows the private token order = request.registry.get('sale.order').browse(request.cr, token and SUPERUSER_ID or request.uid, order_id) @@ -50,6 +50,11 @@ class sale_quote(http.Controller): days = 0 if order.validity_date: days = (datetime.datetime.strptime(order.validity_date, '%Y-%m-%d') - datetime.datetime.now()).days + 1 + if pdf: + report_obj = request.registry['report'] + pdf = report_obj.get_pdf(request.cr, SUPERUSER_ID, [order_id], 'website_quote.report_quote', data=None, context=request.context) + pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))] + return request.make_response(pdf, headers=pdfhttpheaders) values = { 'quotation': order, 'message': message and int(message) or False, diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml index 40335af3dff..b4613bd5e6d 100644 --- a/addons/website_quote/data/website_quotation_data.xml +++ b/addons/website_quote/data/website_quotation_data.xml @@ -101,7 +101,7 @@
    -
    +

    Our offer is based on 3 commitments, which drive our business and our partners:

    @@ -110,7 +110,7 @@
    -
    +

    Quality

    @@ -122,7 +122,7 @@
    -
    +

    Service

    @@ -134,7 +134,7 @@
    -
    +

    Price

    diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml index daffe0f07e5..6f3c1354733 100644 --- a/addons/website_quote/data/website_quotation_demo.xml +++ b/addons/website_quote/data/website_quotation_demo.xml @@ -59,7 +59,7 @@
    -
    +

    Our partnership offer includes all you need to grow your business and deliver quality services @@ -80,7 +80,7 @@

    -
    +

    A Valuable Product

    @@ -97,7 +97,7 @@
    -
    +

    A Strong Demand

    @@ -113,7 +113,7 @@
    -
    +

    High Margins

    @@ -147,10 +147,10 @@
    -
    +

    Get access to our experts

    -
    +

    For an extra fee, partners can get access to Odoo's core developers and functional experts. This can help @@ -159,7 +159,7 @@ consultants on demand.

    -
    +
    @@ -167,10 +167,10 @@
    -
    +

    Official certified partner

    -
    +

    Odoo promotes its partners through various ways: publication on our website, official communication, @@ -180,7 +180,7 @@ directory listing.

    -
    +
    @@ -188,10 +188,10 @@
    -
    +

    Access to the Lead

    -
    +

    Every year, we redirect more than 100,000 customer requests to our official partners. These are prospects @@ -201,7 +201,7 @@ (nearest partner) and the grade of the partner.

    -
    +
    @@ -222,10 +222,10 @@

    Test developments automatically

    -
    +
    -
    +

    Save time in your implementation project by having your developments tested automatically by our automated test @@ -259,7 +259,7 @@

    -
    +

    These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+ Pearson VUE test centers worldwide.

    @@ -271,13 +271,13 @@
  • Better comfort to facilitate your learning process
    • -
    +

    Structure of the Training

    -
    +

    There are three components to the training

    • Videos with detailed demos
      • @@ -304,20 +304,21 @@
      -
      +

      Course Summary

      -
      +

      This course is dedicated to developers who need to grasp knowledge of the business applications development process. This course is for new developers or for IT professionals eager to learn more about technical aspects.

      -
      + +

      What you will learn?

      -
      +

      Day 1

      @@ -336,7 +337,7 @@
      -
      +

      Day 2

      @@ -357,7 +358,7 @@
      -
      +

      Day 3

      @@ -383,11 +384,11 @@
      -
      +

      Requirements

      -
      +

      Objectives:

      Having attended this course, participants should be able to:

      @@ -395,20 +396,20 @@
      • Understand the development concepts and architecture;
      • Install and administer your own server;
      • Develop a new module for a particular application.
        • -

      +

     

    Our prices include:

    • drinks and lunch;
    • training material.
      • -

    +

     

    Requirements:

    • Bring your own laptop.
    • Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended.
    • Participants preferably have a functional knowledge of our software (see Functional Training).
      • -

    +

     

    To get more information, visit the Odoo Official Website.

    @@ -433,16 +434,16 @@
    -
    +

    Objectives

    -
    +

    Upon completion of the training, the participant will be able to:

    • Install and administer Odoo.
    • Become an Odoo Consultant.
    • Do the GAP analysis of any Business Process.
      • -
    • Understand the functional concepts, business processes byOdoo.
      • +
    • Understand the functional concepts, business processes by Odoo.
    • Operate/Work with Odoo Smoothly on regular basis.
    • Configure Odoo using the standard modules.
    • Change the look and feel from the front-end(GUI) rather than aneed of technical knowledge.
      • @@ -453,10 +454,10 @@
    -
    +

    What you will learn?

    -
    +

    Day 1

    @@ -472,7 +473,7 @@
    -
    +

    Day 2

    @@ -488,7 +489,7 @@
    -
    +

    Day 3

    @@ -508,7 +509,7 @@
    -
    +

    Requirements

    • Bring your own laptop.
      • diff --git a/addons/website_quote/quotation_report.xml b/addons/website_quote/quotation_report.xml new file mode 100644 index 00000000000..b9b363b06c6 --- /dev/null +++ b/addons/website_quote/quotation_report.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/addons/website_quote/views/report_quotation.xml b/addons/website_quote/views/report_quotation.xml new file mode 100644 index 00000000000..737b164d075 --- /dev/null +++ b/addons/website_quote/views/report_quotation.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml index bce804af470..37954db1b0a 100644 --- a/addons/website_quote/views/website_quotation.xml +++ b/addons/website_quote/views/website_quotation.xml @@ -167,7 +167,7 @@
    - + + + + + + +