+
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 5023d3b8eea..16af83dd5ac 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -28,9 +28,6 @@ class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
_columns = {
- 'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
- implied_group='sale.group_delivery_invoice_address',
- help="Allows you to specify different delivery and invoice addresses on a sales order."),
'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
implied_group='sale_stock.group_invoice_deli_orders',
help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index 93bc8e5980e..b039251d827 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -8,12 +8,6 @@
-
-
Quotes Slider
-
-
- Margin resize
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 5096d0c8b03..75a98869646 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -44,6 +44,14 @@ class WebsiteUiSuite(unittest.TestSuite):
self._timeout = timeout
self._options = options
self._test = None
+ self._ignore_filters = [
+ # Ignore phantomjs warnings
+ "*** WARNING:",
+
+ # Fixes an issue with PhantomJS 1.9.2 on OS X 10.9 (Mavericks)
+ # cf. https://github.com/ariya/phantomjs/issues/11418
+ "CoreText performance note",
+ ]
def __iter__(self):
return iter([self])
@@ -97,9 +105,7 @@ class WebsiteUiSuite(unittest.TestSuite):
for stream in ready:
lines = stream.readlines()
if lines is None: # EOF
- # Fixes an issue with PhantomJS 1.9.2 on OS X 10.9 (Mavericks)
- # cf. https://github.com/ariya/phantomjs/issues/11418
- filtered_lines = [line for line in output if "CoreText performance note" not in line]
+ filtered_lines = [line for line in output if not any(ignore in line for ignore in self._ignore_filters)]
if (filtered_lines):
self.process(filtered_lines, result)
readable.remove(stream)
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index aa9a136ecdb..a84cd114782 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -117,7 +117,7 @@
Write one sentence to convince visitor about your message.
- + Contact us
@@ -277,7 +277,7 @@
Quotes Slider
-
-
-
-
+ +
Blog
OpenERP includes a full features enterprise blog to promote your messages.
- -- +
Pricing Tables
Use building blocks to use pricing tables to display your products or services.
- -- +
Log In & Signup
Clean & simple Log In, Signup & Forgot Your Password forms.
- -- +
+Contact
User-friendly contact form with Google Map integration.
- - - +
-
-
-
-
+ +
Bootstrap
Uses Twitter Bootstrap's sleek, intuitive, and powerful front-end framework.
- -- +
Google Web Fonts
Royalty free, open source fonts for the people, by the people!
- -- +
Powerful & slick jQuery
Fantastic jQuery plugins such as Isotope and Bootstrap's inbuilt features.
- -- +
+Sample images
Fantastic sample images fully licensed for use.
- - +
-
+
-
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 0074e999e1a..224aeb21e17 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -76,7 +76,7 @@
-
-
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 7bbfdef9b03..ef669aaa324 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -23,7 +23,7 @@
-
+ @@ -51,11 +51,21 @@-+---
+
-
@@ -237,6 +247,9 @@
col-md-3 + @@ -257,6 +270,9 @@col-md-9 +col-md-3 + diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py index 55efcf01dbf..400411ed329 100644 --- a/addons/website_mail/__openerp__.py +++ b/addons/website_mail/__openerp__.py @@ -28,7 +28,10 @@ 'author': 'OpenERP SA', 'depends': ['website', 'mail'], 'data': [ + 'views/snippets.xml', 'views/website_mail.xml', + 'views/website_email_designer.xml', + 'views/email_template_view.xml', 'security/website_mail.xml', ], 'css': [ diff --git a/addons/website_mail/controllers/__init__.py b/addons/website_mail/controllers/__init__.py index 8ee9bae18d9..d70eef6b8ee 100644 --- a/addons/website_mail/controllers/__init__.py +++ b/addons/website_mail/controllers/__init__.py @@ -1 +1,2 @@ +import email_designer import main diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py new file mode 100644 index 00000000000..a7f6ef8d287 --- /dev/null +++ b/addons/website_mail/controllers/email_designer.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- + +# from openerp import SUPERUSER_ID +from openerp.addons.web import http +from openerp.addons.web.http import request +from openerp.addons.website.models import website + + +class WebsiteEmailDesigner(http.Controller): + + @website.route('/website_mail/email_designer/col-md-9 +%s' % html + root = lxml.html.fromstring(html) + + base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url') + (base_scheme, base_netloc, bpath, bparams, bquery, bfragment) = urlparse.urlparse(base_url) + + def _process_link(url): + new_url = url + (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url) + if not scheme and not netloc: + new_url = urlparse.urlunparse((base_scheme, base_netloc, path, params, query, fragment)) + return new_url + + # check all nodes, replace : + # - img src -> check URL + # - a href -> check URL + for node in root.iter(): + if node.tag == 'a': + node.set('href', _process_link(node.get('href'))) + elif node.tag == 'img' and not node.get('src', 'data').startswith('data'): + node.set('src', _process_link(node.get('src'))) + + html = lxml.html.tostring(root, pretty_print=False, method='html') + # this is ugly, but lxml/etree tostring want to put everything in a 'div' that breaks the editor -> remove that + if html.startswith('') and html.endswith(''): + html = html[5:-6] + return html + + def create(self, cr, uid, values, context=None): + if 'body_html' in values: + values['body_html'] = self._postprocess_html_replace_links(cr, uid, values['body_html'], context=context) + return super(EmailTemplate, self).create(cr, uid, values, context=context) + + def write(self, cr, uid, ids, values, context=None): + if 'body_html' in values: + values['body_html'] = self._postprocess_html_replace_links(cr, uid, values['body_html'], context=context) + return super(EmailTemplate, self).write(cr, uid, ids, values, context=context) diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js new file mode 100644 index 00000000000..25577004700 --- /dev/null +++ b/addons/website_mail/static/src/js/website_email_designer.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + var website = openerp.website; + + website.snippet.BuildingBlock.include({ + + // init: function (parent) { + // this._super.apply(this, arguments); + // }, + + _get_snippet_url: function () { + return '/website_mail/snippets'; + } + + }); +})(); diff --git a/addons/website_mail/views/email_template_view.xml b/addons/website_mail/views/email_template_view.xml new file mode 100644 index 00000000000..3206eaeaee6 --- /dev/null +++ b/addons/website_mail/views/email_template_view.xml @@ -0,0 +1,16 @@ + ++ + diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml new file mode 100644 index 00000000000..0ec93296ddd --- /dev/null +++ b/addons/website_mail/views/snippets.xml @@ -0,0 +1,459 @@ + ++ + + +email.template.form +email.template ++ + ++ ++ + + + + diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml new file mode 100644 index 00000000000..e44c9f84a03 --- /dev/null +++ b/addons/website_mail/views/website_email_designer.xml @@ -0,0 +1,54 @@ + ++ ++ + + ++ +++ + ++ + +++ + +++
+ Text-Image
+ +++ +
++ + ++ ++++ +
++ + ++ +A Section Subtitle
+ ++ + +
+ ++ + +++
+ Image-Text
+ +++ +
++ + ++ ++++ +
++ + ++ +
+ + + +A Section Subtitle
+ +++ + +++
+ Big Message
+ +++ +
++ + ++ +++Sell Online. Easily.
+ +++ + +++
+ Text Block
+ +++ +
++ ++ ++ A Great Headline +
++ A good subtitle +
++ + ++ ++ + + + ++++ + +++
+ Separator
+ +++ +
++ + ++ +++
+++ + +++
+ Big Picture
+ +++ +
++ ++ +A Punchy Headline
++ ++ +
+ + + ++ +A Small Subtitle
+ + +++ +++
+ Three Columns
+ +++ +
++ ++ +
+ + +
+ + +
+ + + ++ +Feature One
+ ++ +Feature Two
+ ++ +Feature Three
+ ++ + ++ +++ + +++
+ Comparisons
+ ++++Our Offers
++ +
++ ++ +Beginner
+ ++ +Professional
+ ++ +Expert
+ ++ ++ +$450.00
+per month
++ +$590.00
+per month
++ +$890.00
+per month
++ ++ +-
+
- Battery: 8 hours +
- Screen: 2.5 inch +
- Weight: 1.1 ounces +
- No support +
+ +-
+
- Battery: 12 hours +
- Screen: 2.8 inch +
- Weight: 1.2 ounces +
- Limited support +
+ +-
+
- Battery: 20 hours +
- Screen: 2.8 inch +
- Weight: 1.2 ounces +
- Unlimited support +
+ + ++ + ++ + ++ + +++ +++
+ Button
+ +++ +
++ + ++ ++++ +
++ ++ + View Product + + ++ + ++ ++++ +
++ ++ + View Product + + ++ + ++ ++++ +
++ ++ + View Product + + ++ + +++ +++ + + ++ + + + + + + + diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 7696d01a49d..b53b6371c1d 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -114,10 +114,10 @@ class Ecommerce(http.Controller): _order = 'website_published desc, website_sequence desc' - def get_attribute_ids(self): - attributes_obj = request.registry['product.attribute'] - attributes_ids = attributes_obj.search(request.cr, request.uid, [], context=request.context) - return attributes_obj.browse(request.cr, request.uid, attributes_ids, context=request.context) + def get_characteristic_ids(self): + characteristics_obj = request.registry['product.characteristic'] + characteristics_ids = characteristics_obj.search(request.cr, request.uid, [], context=request.context) + return characteristics_obj.browse(request.cr, request.uid, characteristics_ids, context=request.context) def get_pricelist(self): """ Shortcut to get the pricelist from the website model """ @@ -134,13 +134,13 @@ class Ecommerce(http.Controller): product_ids = [id for id in product_ids if id in product_obj.search(request.cr, request.uid, [("id", 'in', product_ids)], context=request.context)] return product_obj.browse(request.cr, request.uid, product_ids, context=request.context) - def has_search_filter(self, attribute_id, value_id=None): + def has_search_filter(self, characteristic_id, value_id=None): if request.httprequest.args.get('filters'): filters = simplejson.loads(request.httprequest.args['filters']) else: filters = [] for key_val in filters: - if key_val[0] == attribute_id and (not value_id or value_id in key_val[1:]): + if key_val[0] == characteristic_id and (not value_id or value_id in key_val[1:]): return key_val return False @@ -176,11 +176,11 @@ class Ecommerce(http.Controller): post.get("category") and ("&category=%s" % post.get("category")) or "" )) - def attributes_to_ids(self, attributes): - obj = request.registry.get('product.attribute.product') + def characteristics_to_ids(self, characteristics): + obj = request.registry.get('product.characteristic.product') domain = [] - for key_val in attributes: - domain.append(("attribute_id", "=", key_val[0])) + for key_val in characteristics: + domain.append(("characteristic_id", "=", key_val[0])) if isinstance(key_val[1], list): domain.append(("value", ">=", key_val[1][0])) domain.append(("value", "<=", key_val[1][1])) @@ -215,7 +215,7 @@ class Ecommerce(http.Controller): if filters: filters = simplejson.loads(filters) if filters: - ids = self.attributes_to_ids(filters) + ids = self.characteristics_to_ids(filters) domain.append(('id', 'in', ids or [0])) product_count = product_obj.search_count(cr, uid, domain, context=context) @@ -491,10 +491,6 @@ class Ecommerce(http.Controller): shipping_partner = orm_partner.browse(cr, SUPERUSER_ID, shipping_ids[0], context) checkout.update(info.from_partner(shipping_partner, address_type='shipping')) - for field_name in info.mandatory_fields(): - if not checkout[field_name]: - error[field_name] = 'missing' - return request.website.render("website_sale.checkout", values) @website.route(['/shop/confirm_order/'], type='http', auth="public", multilang=True) @@ -549,7 +545,7 @@ class Ecommerce(http.Controller): company_ids = orm_parter.search(cr, SUPERUSER_ID, [("name", "ilike", company_name), ('is_company', '=', True)], context=context) company_id = (company_ids and company_ids[0]) or orm_parter.create(cr, SUPERUSER_ID, {'name': company_name, 'is_company': True}, context) - billing_info = dict(checkout) + billing_info = dict((k, v) for k,v in checkout.items() if "shipping_" not in k and k != "company") billing_info['parent_id'] = company_id if request.uid != request.registry['website'].get_public_user(cr, uid, context): diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml index 5d9f8be57ce..4d0fae19f67 100644 --- a/addons/website_sale/data/website_sale_data.xml +++ b/addons/website_sale/data/website_sale_data.xml @@ -2,6 +2,11 @@+ ++ + ++++ ++++++ +Email From++++ +To (Email)++++ +To (Partners)++++ +Reply To++++ +Subject+++ +++ + + + + + +Product Characteristic (not supported) ++ Shop /shop diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py index 07bad24c72e..2dbf56cee88 100644 --- a/addons/website_sale/models/__init__.py +++ b/addons/website_sale/models/__init__.py @@ -1,6 +1,7 @@ import website_styles import payment_transaction import product -import product_attributes +import product_characteristics +import res_config import sale_order import website diff --git a/addons/website_sale/models/product_attributes.py b/addons/website_sale/models/product_attributes.py deleted file mode 100644 index 6efa13905fb..00000000000 --- a/addons/website_sale/models/product_attributes.py +++ /dev/null @@ -1,87 +0,0 @@ - -from openerp.osv import osv, fields - - -class attributes(osv.Model): - _name = "product.attribute" - - def _get_float_max(self, cr, uid, ids, field_name, arg, context=None): - result = dict.fromkeys(ids, 0) - if ids: - cr.execute(""" - SELECT attribute_id, MAX(value) - FROM product_attribute_product - WHERE attribute_id in (%s) - GROUP BY attribute_id - """ % ",".join(map(str, ids))) - result.update(dict(cr.fetchall())) - return result - - def _get_float_min(self, cr, uid, ids, field_name, arg, context=None): - result = dict.fromkeys(ids, 0) - if ids: - cr.execute(""" - SELECT attribute_id, MIN(value) - FROM product_attribute_product - WHERE attribute_id in (%s) - GROUP BY attribute_id - """ % ",".join(map(str, ids))) - result.update(dict(cr.fetchall())) - return result - - def _get_min_max(self, cr, uid, ids, context=None): - result = {} - for value in self.pool.get('product.attribute.product').browse(cr, uid, ids, context=context): - if value.type == 'float': - result[value.attribute_id.id] = True - return result.keys() - - _columns = { - 'name': fields.char('Name', size=64, translate=True, required=True), - 'type': fields.selection([('distinct', 'Textual Value'), ('float', 'Numeric Value')], "Type", required=True), - 'value_ids': fields.one2many('product.attribute.value', 'attribute_id', 'Values'), - 'attr_product_ids': fields.one2many('product.attribute.product', 'attribute_id', 'Products'), - - 'float_max': fields.function(_get_float_max, type='float', string="Max", store={ - 'product.attribute.product': (_get_min_max, ['value','attribute_id'], 20), - }), - 'float_min': fields.function(_get_float_min, type='float', string="Min", store={ - 'product.attribute.product': (_get_min_max, ['value','attribute_id'], 20), - }), - 'visible': fields.boolean('Display Filter on Website'), - } - _defaults = { - 'type': 'distinct', - 'visible': True, - } - -class attributes_value(osv.Model): - _name = "product.attribute.value" - _columns = { - 'name': fields.char('Value', size=64, translate=True, required=True), - 'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True), - 'atr_product_ids': fields.one2many('product.attribute.product', 'value_id', 'Products'), - } - -class attributes_product(osv.Model): - _name = "product.attribute.product" - _order = 'attribute_id, value_id, value' - _columns = { - 'value': fields.float('Numeric Value'), - 'value_id': fields.many2one('product.attribute.value', 'Textual Value'), - 'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True), - 'product_tmpl_id': fields.many2one('product.template', 'Product', required=True), - - 'type': fields.related('attribute_id', 'type', type='selection', - selection=[('distinct', 'Distinct'), ('float', 'Float')], string='Type'), - } - - def onchange_attribute_id(self, cr, uid, ids, attribute_id, context=None): - attribute = self.pool.get('product.attribute').browse(cr, uid, attribute_id, context=context) - return {'value': {'type': attribute.type, 'value_id': False, 'value': ''}} - -class product_template(osv.Model): - _inherit = "product.template" - _columns = { - 'website_attribute_ids': fields.one2many('product.attribute.product', 'product_tmpl_id', 'Product Attributes'), - } diff --git a/addons/website_sale/models/product_characteristics.py b/addons/website_sale/models/product_characteristics.py new file mode 100644 index 00000000000..fff6846da65 --- /dev/null +++ b/addons/website_sale/models/product_characteristics.py @@ -0,0 +1,87 @@ + +from openerp.osv import osv, fields + + +class characteristics(osv.Model): + _name = "product.characteristic" + + def _get_float_max(self, cr, uid, ids, field_name, arg, context=None): + result = dict.fromkeys(ids, 0) + if ids: + cr.execute(""" + SELECT characteristic_id, MAX(value) + FROM product_characteristic_product + WHERE characteristic_id in (%s) + GROUP BY characteristic_id + """ % ",".join(map(str, ids))) + result.update(dict(cr.fetchall())) + return result + + def _get_float_min(self, cr, uid, ids, field_name, arg, context=None): + result = dict.fromkeys(ids, 0) + if ids: + cr.execute(""" + SELECT characteristic_id, MIN(value) + FROM product_characteristic_product + WHERE characteristic_id in (%s) + GROUP BY characteristic_id + """ % ",".join(map(str, ids))) + result.update(dict(cr.fetchall())) + return result + + def _get_min_max(self, cr, uid, ids, context=None): + result = {} + for value in self.pool.get('product.characteristic.product').browse(cr, uid, ids, context=context): + if value.type == 'float': + result[value.characteristic_id.id] = True + return result.keys() + + _columns = { + 'name': fields.char('Name', size=64, translate=True, required=True), + 'type': fields.selection([('distinct', 'Textual Value'), ('float', 'Numeric Value')], "Type", required=True), + 'value_ids': fields.one2many('product.characteristic.value', 'characteristic_id', 'Values'), + 'attr_product_ids': fields.one2many('product.characteristic.product', 'characteristic_id', 'Products'), + + 'float_max': fields.function(_get_float_max, type='float', string="Max", store={ + 'product.characteristic.product': (_get_min_max, ['value','characteristic_id'], 20), + }), + 'float_min': fields.function(_get_float_min, type='float', string="Min", store={ + 'product.characteristic.product': (_get_min_max, ['value','characteristic_id'], 20), + }), + 'visible': fields.boolean('Display Filter on Website'), + } + _defaults = { + 'type': 'distinct', + 'visible': True, + } + +class characteristics_value(osv.Model): + _name = "product.characteristic.value" + _columns = { + 'name': fields.char('Value', size=64, translate=True, required=True), + 'characteristic_id': fields.many2one('product.characteristic', 'Characteristic', required=True), + 'atr_product_ids': fields.one2many('product.characteristic.product', 'value_id', 'Products'), + } + +class characteristics_product(osv.Model): + _name = "product.characteristic.product" + _order = 'characteristic_id, value_id, value' + _columns = { + 'value': fields.float('Numeric Value'), + 'value_id': fields.many2one('product.characteristic.value', 'Textual Value'), + 'characteristic_id': fields.many2one('product.characteristic', 'Characteristic', required=True), + 'product_tmpl_id': fields.many2one('product.template', 'Product', required=True), + + 'type': fields.related('characteristic_id', 'type', type='selection', + selection=[('distinct', 'Distinct'), ('float', 'Float')], string='Type'), + } + + def onchange_characteristic_id(self, cr, uid, ids, characteristic_id, context=None): + characteristic = self.pool.get('product.characteristic').browse(cr, uid, characteristic_id, context=context) + return {'value': {'type': characteristic.type, 'value_id': False, 'value': ''}} + +class product_template(osv.Model): + _inherit = "product.template" + _columns = { + 'website_characteristic_ids': fields.one2many('product.characteristic.product', 'product_tmpl_id', 'Product Characteristics'), + } diff --git a/addons/website_sale/models/res_config.py b/addons/website_sale/models/res_config.py new file mode 100644 index 00000000000..0c2663732dd --- /dev/null +++ b/addons/website_sale/models/res_config.py @@ -0,0 +1,11 @@ + +from openerp.osv import osv, fields + +class sale_configuration(osv.osv_memory): + _inherit = 'sale.config.settings' + + _columns = { + 'group_product_characteristics': fields.boolean("Support multiple characteristics per products ", + implied_group='product.group_product_characteristics', + help="""Allow to manage several characteristics per product. This characteristics are used for filter and compare your products. As an example, if you sell all in one computers, you may have characteristics like RAM, Processor Speed, Manufacturing, to compare products"""), + } diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv index 8b3318af094..0a16d3bd4cf 100644 --- a/addons/website_sale/security/ir.model.access.csv +++ b/addons/website_sale/security/ir.model.access.csv @@ -7,8 +7,8 @@ access_product_pricelist_version_public,product.pricelist.version.public,product access_product_pricelist_public,product.pricelist.public,product.model_product_pricelist,base.group_public,1,0,0,0 access_product_pricelist_item_public,product.pricelist.item.public,product.model_product_pricelist_item,base.group_public,1,0,0,0 access_product_product_price_type_public,product.price.type.public,product.model_product_price_type,base.group_public,1,0,0,0 -access_product_attribute,product.attribute.public,website_sale.model_product_attribute,,1,0,0,0 -access_product_attribute_value,product.attribute.value.public,website_sale.model_product_attribute_value,,1,0,0,0 -access_product_attribute_product,product.attribute.product.public,website_sale.model_product_attribute_product,,1,0,0,0 +access_product_characteristic,product.characteristic.public,website_sale.model_product_characteristic,,1,0,0,0 +access_product_characteristic_value,product.characteristic.value.public,website_sale.model_product_characteristic_value,,1,0,0,0 +access_product_characteristic_product,product.characteristic.product.public,website_sale.model_product_characteristic_product,,1,0,0,0 access_website_product_style,website.product.style.public,website_sale.model_website_product_style,,1,0,0,0 access_product_supplierinfo,product.supplierinfo.public,product.model_product_supplierinfo,base.group_public,1,0,0,0 diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 78c360bc296..0c014ea1664 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -92,7 +92,7 @@-+diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml index e12c5d40a10..a2e18f552c1 100644 --- a/addons/website_sale/views/website_sale_backend.xml +++ b/addons/website_sale/views/website_sale_backend.xml @@ -2,6 +2,19 @@@@ -189,7 +189,7 @@No product found
-There isn't available products right know, click here to contact us
+There isn't available products right now, click here to contact us
Click on "Content" to define a new product or "Help" for more informations.
@@ -371,13 +371,13 @@
-
-
+
+
- @@ -595,36 +595,36 @@ - +
+
- : , : , -@@ -1036,14 +1034,16 @@ "widget": "contact", "fields": ["address", "name", "phone", "email"] }'/> -- - --- - --- - --- - -- -- - -- - -- - --- - --- - --- - -- - - -- -+++ + +++ + +++ + +++ +--+Shipping Information
- -- - --- - --- - -- -- - --- - --- - --- - -++ +- + + ++ + +++ + +++ + +++ + ++ + + ++ ++++Shipping Information
+ ++ + +++ + +++ + ++ ++ + +++ + +++ + +++ + ++Your Order change
@@ -962,19 +960,19 @@ - -Ship To:
-- + + - Ship to the same address -Ship To:
++ + + Ship to the same address ++ Change Address +- Change Address --Ship To:
-- + + - Ship to the same addressShip To:
++ + + Ship to the same address+ + sale settings +sale.config.settings ++ + ++ ++++ + product.normal.form.inherit @@ -48,15 +61,15 @@- - - + + + + context="{'default_characteristic_id': characteristic_id}" + domain="[('characteristic_id', '=', characteristic_id)]"/> - product.attribute.form -product.attribute ++ product.characteristic.form +product.characteristic -
+++++No job offer found
+There isn't job offer published now, click here to contact us
++ +Click on "Content" to define a new job offer or "Help" for more informations.
+
+ -
@@ -197,7 +197,7 @@
-
+
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index a3afdcbfd83..306266472aa 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -98,14 +98,14 @@
-
- No blog post yet! -
-- To create a new blog post, use the top-right menu Content - and select the menuitem New Blog Post. -
- +
+
+
+
+
No blog post found
+There isn't available blog post right now, click here to contact us
+Click on "Content" to define a new blog post or "Help" for more informations.
+
+
diff --git a/addons/website_crm/__openerp__.py b/addons/website_crm/__openerp__.py
index a1776cfbd39..08817314910 100644
--- a/addons/website_crm/__openerp__.py
+++ b/addons/website_crm/__openerp__.py
@@ -15,4 +15,5 @@ OpenERP Contact Form
'views/website_crm.xml',
],
'installable': True,
+ 'auto_install': True,
}
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index d042c303b4f..1fdbaf1cbe3 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -44,12 +44,15 @@
-
- No event found in this category, check all events. -
-- No events are planned for now on. -
+
+ There isn't available events right now,
+
+
+
+
No event found
+There isn't available events right now, click here to check all events or click here to contact us
+ Click on "Content" to define a new event or "Help" for more informations.
+
+ In the backend's event form contains information to customize your events: location, oranizer, tikets, registrations, etc.
+