diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml index ec89155d21d..ba928802e63 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml @@ -1,6 +1,5 @@ - - + - - + diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml index 9f8f120dd7d..7693da5ed42 100644 --- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml +++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml @@ -1,6 +1,7 @@ - + + delivery.carrier.website.form delivery.carrier @@ -18,6 +19,10 @@ - + - + diff --git a/addons/website_sale_digital/controllers/main.py b/addons/website_sale_digital/controllers/main.py index 6da0c56c0c4..312dcca81f2 100644 --- a/addons/website_sale_digital/controllers/main.py +++ b/addons/website_sale_digital/controllers/main.py @@ -4,6 +4,7 @@ import base64 from cStringIO import StringIO from werkzeug.utils import redirect + from odoo import http from odoo.http import request from odoo.addons.website_portal.controllers.main import website_account diff --git a/addons/website_sale_digital/data/product_demo.xml b/addons/website_sale_digital/data/product_demo.xml index 67f58c5c313..61e6a290303 100644 --- a/addons/website_sale_digital/data/product_demo.xml +++ b/addons/website_sale_digital/data/product_demo.xml @@ -1,4 +1,6 @@ + + Alice's Adventures in Wonderland - Lewis Caroll 2 @@ -9,6 +11,7 @@ Novel by Lewis Caroll. Alice's Adventures in Wonderland (commonly shortened to Alice in Wonderland) is an 1865 novel written by English author Charles Lutwidge Dodgson under the pseudonym Lewis Carroll. It tells of a girl named Alice falling through a rabbit hole into a fantasy world populated by peculiar, anthropomorphic creatures. The tale plays with logic, giving the story lasting popularity with adults as well as with children. It is considered to be one of the best examples of the literary nonsense genre. Its narrative course and structure, characters and imagery have been enormously influential in both popular culture and literature, especially in the fantasy genre. + alice.pdf alice.pdf @@ -18,4 +21,5 @@ product.template True + diff --git a/addons/website_sale_digital/models/account_invoice.py b/addons/website_sale_digital/models/account_invoice.py index e60313fb9e3..b6b28026dde 100644 --- a/addons/website_sale_digital/models/account_invoice.py +++ b/addons/website_sale_digital/models/account_invoice.py @@ -1,8 +1,11 @@ -# -*- encoding: utf-8 -*- -from openerp import models +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models class AccountInvoiceLine(models.Model): + _inherit = ['account.invoice.line'] def get_digital_purchases(self): diff --git a/addons/website_sale_digital/models/ir_attachment.py b/addons/website_sale_digital/models/ir_attachment.py index a47d51c081d..46c26271c99 100644 --- a/addons/website_sale_digital/models/ir_attachment.py +++ b/addons/website_sale_digital/models/ir_attachment.py @@ -1,8 +1,11 @@ -# -*- encoding: utf-8 -*- -from openerp import models, fields, api, _ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models -class ir_attachment(models.Model): +class Attachment(models.Model): + _inherit = ['ir.attachment'] product_downloadable = fields.Boolean("Downloadable from product portal", default=False) diff --git a/addons/website_sale_digital/models/product.py b/addons/website_sale_digital/models/product.py index ad138c99940..6dcd85f539f 100644 --- a/addons/website_sale_digital/models/product.py +++ b/addons/website_sale_digital/models/product.py @@ -1,5 +1,7 @@ -# -*- encoding: utf-8 -*- -from openerp import models, fields, api, _ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models, _ class ProductTemplate(models.Model): diff --git a/addons/website_sale_options/__init__.py b/addons/website_sale_options/__init__.py index 9f86759e32b..ac0011716f6 100644 --- a/addons/website_sale_options/__init__.py +++ b/addons/website_sale_options/__init__.py @@ -1,2 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import controllers import models diff --git a/addons/website_sale_options/controllers/__init__.py b/addons/website_sale_options/controllers/__init__.py index 039d9715fab..f48716d3a69 100644 --- a/addons/website_sale_options/controllers/__init__.py +++ b/addons/website_sale_options/controllers/__init__.py @@ -1 +1,4 @@ -import main \ No newline at end of file +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import main diff --git a/addons/website_sale_options/data/product_demo.xml b/addons/website_sale_options/data/product_demo.xml index 94628dbd841..a2acbe46c48 100644 --- a/addons/website_sale_options/data/product_demo.xml +++ b/addons/website_sale_options/data/product_demo.xml @@ -1,5 +1,5 @@ - + @@ -55,4 +55,4 @@ - + diff --git a/addons/website_sale_options/models/__init__.py b/addons/website_sale_options/models/__init__.py index 806ebb7b64f..4fed6601c92 100644 --- a/addons/website_sale_options/models/__init__.py +++ b/addons/website_sale_options/models/__init__.py @@ -1,2 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import product -import sale_order \ No newline at end of file +import sale_order diff --git a/addons/website_sale_options/views/product_views.xml b/addons/website_sale_options/views/product_views.xml index dbc43563443..154a06c1e6a 100644 --- a/addons/website_sale_options/views/product_views.xml +++ b/addons/website_sale_options/views/product_views.xml @@ -1,8 +1,7 @@ - - + - + product.template.product.website.form product.template @@ -13,5 +12,4 @@ - - + diff --git a/addons/website_sale_options/views/website_sale_options_templates.xml b/addons/website_sale_options/views/website_sale_options_templates.xml index 7b15d4ba663..b0445344f66 100644 --- a/addons/website_sale_options/views/website_sale_options_templates.xml +++ b/addons/website_sale_options/views/website_sale_options_templates.xml @@ -1,6 +1,5 @@ - - + - - +