diff --git a/addons/website_sale_delivery/__openerp__.py b/addons/website_sale_delivery/__openerp__.py index b89473f89ff..6b54c891f3c 100644 --- a/addons/website_sale_delivery/__openerp__.py +++ b/addons/website_sale_delivery/__openerp__.py @@ -10,9 +10,9 @@ Delivery Costs """, 'depends': ['website_sale', 'delivery', 'website_sale_stock'], 'data': [ - 'views/website_sale_delivery.xml', - 'views/website_sale_delivery_view.xml', - 'demo/website_sale_delivery_data.xml' + 'views/website_sale_delivery_templates.xml', + 'views/website_sale_delivery_views.xml', + 'data/website_sale_delivery_data.xml' ], 'demo': [ 'data/website_sale_delivery_demo.xml' diff --git a/addons/website_sale_delivery/demo/website_sale_delivery_data.xml b/addons/website_sale_delivery/data/website_sale_delivery_data.xml similarity index 100% rename from addons/website_sale_delivery/demo/website_sale_delivery_data.xml rename to addons/website_sale_delivery/data/website_sale_delivery_data.xml diff --git a/addons/website_sale_delivery/demo/website_sale_delivery_demo.xml b/addons/website_sale_delivery/demo/website_sale_delivery_demo.xml deleted file mode 100644 index 2d3731f9d6e..00000000000 --- a/addons/website_sale_delivery/demo/website_sale_delivery_demo.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/website_sale_delivery/models/__init__.py b/addons/website_sale_delivery/models/__init__.py index 553da9fc56b..0f214940526 100644 --- a/addons/website_sale_delivery/models/__init__.py +++ b/addons/website_sale_delivery/models/__init__.py @@ -1 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import res_country +import delivery import sale_order diff --git a/addons/website_sale_delivery/models/delivery.py b/addons/website_sale_delivery/models/delivery.py new file mode 100644 index 00000000000..4884061ce86 --- /dev/null +++ b/addons/website_sale_delivery/models/delivery.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class DeliveryCarrier(models.Model): + _name = 'delivery.carrier' + _inherit = ['delivery.carrier', 'website.published.mixin'] + + website_description = fields.Text(related='product_id.description_sale', string='Description for Online Quotations') + website_published = fields.Boolean(default=False) diff --git a/addons/website_sale_delivery/models/res_country.py b/addons/website_sale_delivery/models/res_country.py new file mode 100644 index 00000000000..8b4648a7105 --- /dev/null +++ b/addons/website_sale_delivery/models/res_country.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class ResCountry(models.Model): + _inherit = 'res.country' + + def get_website_sale_countries(self, mode='billing'): + res = super(ResCountry, self).get_website_sale_countries(mode=mode) + if mode == 'shipping': + countries = self.env['res.country'] + + delivery_carriers = self.env['delivery.carrier'].sudo().search([('website_published', '=', True)]) + for carrier in delivery_carriers: + if not carrier.country_ids and not carrier.state_ids: + countries = res + break + countries |= carrier.country_ids + + res = res & countries + return res + + def get_website_sale_states(self, mode='billing'): + res = super(ResCountry, self).get_website_sale_states(mode=mode) + + states = self.env['res.country.state'] + if mode == 'shipping': + dom = ['|', ('country_ids', 'in', self.id), ('country_ids', '=', False), ('website_published', '=', True)] + delivery_carriers = self.env['delivery.carrier'].sudo().search(dom) + + for carrier in delivery_carriers: + if not carrier.country_ids and not carrier.state_ids: + states = res + break + states |= carrier.state_ids + res = res & states + return res diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py index d44144a3680..279dd758711 100644 --- a/addons/website_sale_delivery/models/sale_order.py +++ b/addons/website_sale_delivery/models/sale_order.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. import logging from odoo import api, fields, models, _ @@ -7,14 +8,6 @@ from odoo.exceptions import ValidationError _logger = logging.getLogger(__name__) -class DeliveryCarrier(models.Model): - _name = 'delivery.carrier' - _inherit = ['delivery.carrier', 'website.published.mixin'] - - website_description = fields.Text(related='product_id.description_sale', string='Description for Online Quotations') - website_published = fields.Boolean(default=False) - - class SaleOrder(models.Model): _inherit = 'sale.order' @@ -139,38 +132,3 @@ class SaleOrder(models.Model): self._check_carrier_quotation() return values - - -class ResCountry(models.Model): - _inherit = 'res.country' - - def get_website_sale_countries(self, mode='billing'): - res = super(ResCountry, self).get_website_sale_countries(mode=mode) - if mode == 'shipping': - countries = self.env['res.country'] - - delivery_carriers = self.env['delivery.carrier'].sudo().search([('website_published', '=', True)]) - for carrier in delivery_carriers: - if not carrier.country_ids and not carrier.state_ids: - countries = res - break - countries |= carrier.country_ids - - res = res & countries - return res - - def get_website_sale_states(self, mode='billing'): - res = super(ResCountry, self).get_website_sale_states(mode=mode) - - states = self.env['res.country.state'] - if mode == 'shipping': - dom = ['|', ('country_ids', 'in', self.id), ('country_ids', '=', False), ('website_published', '=', True)] - delivery_carriers = self.env['delivery.carrier'].sudo().search(dom) - - for carrier in delivery_carriers: - if not carrier.country_ids and not carrier.state_ids: - states = res - break - states |= carrier.state_ids - res = res & states - return res diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml similarity index 100% rename from addons/website_sale_delivery/views/website_sale_delivery.xml rename to addons/website_sale_delivery/views/website_sale_delivery_templates.xml diff --git a/addons/website_sale_delivery/views/website_sale_delivery_view.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml similarity index 100% rename from addons/website_sale_delivery/views/website_sale_delivery_view.xml rename to addons/website_sale_delivery/views/website_sale_delivery_views.xml diff --git a/addons/website_sale_options/__openerp__.py b/addons/website_sale_options/__openerp__.py index 01f3fd5e27f..323cd78860f 100644 --- a/addons/website_sale_options/__openerp__.py +++ b/addons/website_sale_options/__openerp__.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + { 'name': 'eCommerce Optional Products', 'category': 'Website', @@ -10,11 +13,11 @@ Odoo E-Commerce """, 'depends': ['website_sale'], 'data': [ - 'views/views.xml', - 'views/templates.xml', + 'views/product_views.xml', + 'views/website_sale_options_templates.xml', ], 'demo': [ - 'data/demo.xml', + 'data/product_demo.xml', ], 'qweb': ['static/src/xml/*.xml'], 'installable': True, diff --git a/addons/website_sale_options/data/demo.xml b/addons/website_sale_options/data/product_demo.xml similarity index 100% rename from addons/website_sale_options/data/demo.xml rename to addons/website_sale_options/data/product_demo.xml diff --git a/addons/website_sale_options/views/views.xml b/addons/website_sale_options/views/product_views.xml similarity index 100% rename from addons/website_sale_options/views/views.xml rename to addons/website_sale_options/views/product_views.xml diff --git a/addons/website_sale_options/views/templates.xml b/addons/website_sale_options/views/website_sale_options_templates.xml similarity index 100% rename from addons/website_sale_options/views/templates.xml rename to addons/website_sale_options/views/website_sale_options_templates.xml diff --git a/addons/website_sale_stock/__openerp__.py b/addons/website_sale_stock/__openerp__.py index 8eb7d76af40..fcdd797672b 100644 --- a/addons/website_sale_stock/__openerp__.py +++ b/addons/website_sale_stock/__openerp__.py @@ -13,6 +13,6 @@ ], 'auto_install': True, 'data': [ - 'views/templates.xml', + 'views/website_sale_stock_templates.xml', ] } diff --git a/addons/website_sale_stock/views/templates.xml b/addons/website_sale_stock/views/website_sale_stock_templates.xml similarity index 100% rename from addons/website_sale_stock/views/templates.xml rename to addons/website_sale_stock/views/website_sale_stock_templates.xml