diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index 44dbd3a00f0..a12909337ff 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -27,7 +27,7 @@ - public + Anonymous public public diff --git a/addons/website_quotation/controllers/main.py b/addons/website_quotation/controllers/main.py index e63d43ee007..52decbe6ab2 100644 --- a/addons/website_quotation/controllers/main.py +++ b/addons/website_quotation/controllers/main.py @@ -37,13 +37,13 @@ class sale_quote(http.Controller): # 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) - if token: + if token and not message: assert token == order.access_token, 'Access denied!' body=_('Quotation viewed by customer') self.__message_post(body, order_id, type='comment') days = 0 if order.validity_date: - days = (datetime.datetime.strptime(order.validity_date, '%Y-%m-%d') - datetime.datetime.now()).days + days = (datetime.datetime.strptime(order.validity_date, '%Y-%m-%d') - datetime.datetime.now()).days + 1 values = { 'quotation': order, 'message': message, diff --git a/addons/website_quotation/data/website_quotation_demo.xml b/addons/website_quotation/data/website_quotation_demo.xml index 7d18280d276..0f8fee26364 100644 --- a/addons/website_quotation/data/website_quotation_demo.xml +++ b/addons/website_quotation/data/website_quotation_demo.xml @@ -52,23 +52,6 @@ QF13 - - Advanced Account Functional - - - 50000.0 - 750000.0 - service - - - Learn directly from our team and network of OpenERP experts. Choose from the available training sessions for a better functional understanding of OpenERP - - - - - QF14 - - Partnership Contract @@ -152,31 +135,6 @@ -
-

Enterprise commissions

-

- As an official partner, you benefit from OpenERP Enterprise - commissions, according to your partner grade, as well as - dedicated services restricted to partners like the technical - support. -

- - - - - - - - - - - - - - -
GradeYour Commission
Ready
Silver
Gold
-
-

A Dedicated Account Manager

@@ -294,6 +252,7 @@ Functional Training 1 + 12950.00 10.00 @@ -338,6 +297,7 @@ Technical Training 1 + 00.00

@@ -466,6 +426,7 @@ 1 + 9000.00 10 @@ -566,145 +527,5 @@ - - - Functional Webinar - - 1 - - 18000.00 - -
-

Functional Webinar

-
-
-
-
-
-

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

- -

Introduction to Javascript

-
- -
    -
  • Hello World
    • -
  • Variables & Operators
    • -
  • Dive into Strings
    • -
  • Functions
    • -
  • Loops
    • -
  • Arrays
    • -
-
-

You will be able to develop simple dynamic compenents in HTML pages.

-
-
-
- -
-
-
-

Day 2

- -

OpenERP Web Client

-
- -
    -
  • Introduction to JQuery
    • -
  • Advanced JQuery
    • -
  • Underscore
    • -
  • Introduction to QWeb
    • -
  • Controlers and Views
    • -
  • Bootstrap CSS
    • -
  • Calling the ORM
    • -
-
-

You will be able to create dynamic page interacting with the ORM.

-
-
-
- -
-
-
-

Day 3

- -

Building a Full Application

-
- -
    -
  • Modules
    • -
  • Python Objects
    • -
  • Report Engine
    • -
  • Workflows
    • -
  • Training Center Module
    • -
  • Integrated Help
    • -
  • How to Debug
    • -
-
-

You will be able to develop a full application with backend and user interface.

-
-
-
-
-
- -
-
-
-

Requirements

-
- -
-

Objectives:

- -

Having attended this course, participants should be able to:

- -
    -
  • 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 OpenERP Official Website.

-
-
-
-
- - - diff --git a/addons/website_quotation/models/order.py b/addons/website_quotation/models/order.py index 5e752f46924..34dbc2831ff 100644 --- a/addons/website_quotation/models/order.py +++ b/addons/website_quotation/models/order.py @@ -55,6 +55,7 @@ class sale_quote_line(osv.osv): 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')), 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount')), 'product_uom_qty': fields.float('Quantity', required=True, digits_compute= dp.get_precision('Product UoS')), + 'product_uom_id': fields.many2one('product.uom', 'Unit of Measure ', required=True), } _defaults = { 'product_uom_qty': 1, @@ -104,7 +105,8 @@ class sale_order(osv.osv): 'website_description': fields.html('Description'), 'options' : fields.one2many('sale.order.option', 'order_id', 'Optional Products Lines'), 'validity_date': fields.date('Validity Date'), - 'before_discount': fields.function(_get_total, string='Amount Before Discount', type="float") + 'before_discount': fields.function(_get_total, string='Amount Before Discount', type="float", + digits_compute=dp.get_precision('Account')) } _defaults = { 'access_token': lambda self, cr, uid, ctx={}: str(uuid.uuid4()) diff --git a/addons/website_quotation/views/website_quotation.xml b/addons/website_quotation/views/website_quotation.xml index 527d8185f3b..05214bc4fbb 100644 --- a/addons/website_quotation/views/website_quotation.xml +++ b/addons/website_quotation/views/website_quotation.xml @@ -11,7 +11,7 @@ Products Quantity - Discount(%) + Unit Price Price @@ -23,13 +23,14 @@
- + +
-
- -
+ + % discount + @@ -39,7 +40,7 @@ t-att-class="line.discount and 'text-danger' or ''"/>
- +
@@ -175,7 +176,7 @@
-
+
This offer expires in
@@ -189,7 +190,7 @@
-
+

Your advantage:

@@ -393,8 +394,8 @@ Products - Discription - Discount(%) + Description + Price @@ -408,9 +409,9 @@
-
- -
+ + % discount + @@ -419,7 +420,7 @@ t-att-style="option.discount and 'text-decoration: line-through' or ''" t-att-class="option.discount and 'text-danger' or ''"/>
- +