diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 22ec7f1fd02..99fd4fd379e 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -3,12 +3,15 @@ import cStringIO
import datetime
from itertools import islice
import json
+import xml.etree.ElementTree as ET
+
import logging
import re
from sys import maxint
import werkzeug.utils
+import urllib2
import werkzeug.wrappers
from PIL import Image
@@ -353,6 +356,20 @@ class Website(openerp.addons.web.controllers.main.Home):
obj = _object.browse(request.cr, request.uid, _id)
return bool(obj.website_published)
+ @http.route(['/website/seo_suggest/
'], type='http', auth="public", website=True)
+ def seo_suggest(self, keywords):
+ url = "http://google.com/complete/search"
+ param = {
+ 'ie': 'utf8',
+ 'oe': 'utf8',
+ 'output': 'toolbar',
+ 'q': keywords
+ }
+ req = urllib2.Request("%s?%s" % (url, werkzeug.url_encode(param)))
+ request = urllib2.urlopen(req)
+ xmlroot = ET.fromstring(request.read())
+ return json.dumps([sugg[0].attrib['data'] for sugg in xmlroot if len(sugg) and sugg[0].attrib['data']])
+
#------------------------------------------------------
# Helpers
#------------------------------------------------------
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 12ab72e96d3..8a03e1aeee6 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -522,12 +522,15 @@ div.media_iframe_video {
div.media_iframe_video iframe {
width: 100%;
height: 100%;
+ position: absolute;
+ margin-left: -50%;
}
-div.media_iframe_video div {
+div.media_iframe_video .css_editable_mode_display {
position: absolute;
width: 100%;
height: 100%;
display: none;
+ z-index: 2;
}
/* Mobile view */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 9364511b2df..21e184d5a91 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -99,7 +99,7 @@ header
margin-right: 0 !important
.css_non_editable_mode_hidden
- display: none
+ display: none !important
/* ----- BOOTSTRAP FIX ----- */
@@ -424,11 +424,14 @@ div.media_iframe_video
iframe
width: 100%
height: 100%
- div
+ position: absolute
+ margin-left: -50%
+ .css_editable_mode_display
position: absolute
width: 100%
height: 100%
display: none
+ z-index: 2
/* Mobile view */
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 8d28237f924..7e32a780bf1 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -86,7 +86,7 @@
}
});
}
- $.getJSON("http://suggest.hp.af.cm/suggest/"+encodeURIComponent(this.root + " "), addSuggestions);
+ $.getJSON("/website/seo_suggest/" + encodeURIComponent(this.root + " "), addSuggestions);
},
});
diff --git a/addons/website_quote/__openerp__.py b/addons/website_quote/__openerp__.py
index 975451ffb60..9bea646a3db 100644
--- a/addons/website_quote/__openerp__.py
+++ b/addons/website_quote/__openerp__.py
@@ -13,6 +13,7 @@ OpenERP Sale Quote Roller
'data': [
'views/website_quotation.xml',
'views/website_quotation_backend.xml',
+ 'views/report_saleorder.xml',
'data/website_quotation_data.xml',
'security/ir.model.access.csv',
],
diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index c7ae4bc8ab5..8430ef07791 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -114,7 +114,7 @@ class sale_order(osv.osv):
'template_id': fields.many2one('sale.quote.template', 'Quote Template'),
'website_description': fields.html('Description'),
'options' : fields.one2many('sale.order.option', 'order_id', 'Optional Products Lines'),
- 'validity_date': fields.date('Validity Date'),
+ 'validity_date': fields.date('Expiry Date'),
'amount_undiscounted': fields.function(_get_total, string='Amount Before Discount', type="float",
digits_compute=dp.get_precision('Account'))
}
diff --git a/addons/website_quote/views/report_saleorder.xml b/addons/website_quote/views/report_saleorder.xml
new file mode 100644
index 00000000000..e85a48f9d22
--- /dev/null
+++ b/addons/website_quote/views/report_saleorder.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 91eada15295..6e34b1e3fc1 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -346,18 +346,17 @@ class website_sale(http.Controller):
countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
states_ids = state_orm.search(cr, SUPERUSER_ID, [], context=context)
states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
+ partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context).partner_id
+ order = None
+
+ shipping_id = None
+ shipping_ids = []
checkout = {}
if not data:
if request.uid != request.website.user_id.id:
- partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context).partner_id
checkout.update( self.checkout_parse("billing", partner) )
-
- shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
- if shipping_ids:
- shipping = orm_user.browse(cr, SUPERUSER_ID, request.uid, context)
- checkout.update( self.checkout_parse("shipping", shipping) )
- checkout['shipping_different'] = True
+ shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], context=context)
else:
order = request.website.sale_get_order(force_create=1, context=context)
if order.partner_id:
@@ -367,9 +366,37 @@ class website_sale(http.Controller):
checkout.update( self.checkout_parse("billing", order.partner_id) )
else:
checkout = self.checkout_parse('billing', data)
- if data.get("shipping_different"):
+ try:
+ shipping_id = int(data["shipping_id"])
+ except ValueError:
+ pass
+ if shipping_id == -1:
checkout.update(self.checkout_parse('shipping', data))
- checkout["shipping_different"] = True
+
+ if shipping_id is None:
+ if not order:
+ order = request.website.sale_get_order(context=context)
+ if order and order.partner_shipping_id:
+ shipping_id = order.partner_shipping_id.id
+
+ shipping_ids = list(set(shipping_ids) - set([partner.id]))
+
+ if shipping_id == partner.id:
+ shipping_id = 0
+ elif shipping_id > 0 and shipping_id not in shipping_ids:
+ shipping_ids.append(shipping_id)
+ elif shipping_id is None and shipping_ids:
+ shipping_id = shipping_ids[0]
+
+ ctx = dict(context, show_address=1)
+ shippings = []
+ if shipping_ids:
+ shippings = shipping_ids and orm_partner.browse(cr, SUPERUSER_ID, list(shipping_ids), ctx) or []
+ if shipping_id > 0:
+ shipping = orm_partner.browse(cr, SUPERUSER_ID, shipping_id, ctx)
+ checkout.update( self.checkout_parse("shipping", shipping) )
+
+ checkout['shipping_id'] = shipping_id
# Default search by user country
country_code = request.session['geoip'].get('country_code')
@@ -382,10 +409,12 @@ class website_sale(http.Controller):
'countries': countries,
'states': states,
'checkout': checkout,
- 'shipping_different': checkout.get('shipping_different'),
+ 'shipping_id': partner.id != shipping_id and shipping_id or 0,
+ 'shippings': shippings,
'error': {},
'has_check_vat': hasattr(registry['res.partner'], 'check_vat')
}
+
return values
mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
@@ -445,7 +474,7 @@ class website_sale(http.Controller):
if not check_func(cr, uid, vat_country, vat_number, context=None): # simple_vat_check
error["vat"] = 'error'
- if data.get("shipping_different"):
+ if data.get("shipping_id") == -1:
for field_name in self.mandatory_shipping_fields:
field_name = 'shipping_' + field_name
if not data.get(field_name):
@@ -482,23 +511,22 @@ class website_sale(http.Controller):
partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
# create a new shipping partner
- shipping_id = None
- if checkout.get('shipping_different'):
+ if checkout.get('shipping_id') == -1:
shipping_info = self.checkout_parse('shipping', checkout, True)
shipping_info['type'] = 'delivery'
shipping_info['parent_id'] = partner_id
- shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
+ checkout['shipping_id'] = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
order_info = {
'partner_id': partner_id,
'message_follower_ids': [(4, partner_id)],
'partner_invoice_id': partner_id,
- 'partner_shipping_id': shipping_id or partner_id
}
order_info.update(order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value'])
- order_info.update(order_obj.onchange_delivery_id(cr, SUPERUSER_ID, [], order.company_id.id, partner_id, shipping_id, None, context=context)['value'])
+ order_info.update(order_obj.onchange_delivery_id(cr, SUPERUSER_ID, [], order.company_id.id, partner_id, checkout.get('shipping_id'), None, context=context)['value'])
order_info.pop('user_id')
+ order_info.update(partner_shipping_id=checkout.get('shipping_id') or partner_id)
order_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context)
@@ -535,6 +563,7 @@ class website_sale(http.Controller):
return request.website.render("website_sale.checkout", values)
self.checkout_form_save(values["checkout"])
+
request.session['sale_last_order_id'] = order.id
request.website.sale_get_order(update_pricelist=True, context=context)
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index e2f9733390d..ac12a4d5756 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -2,12 +2,19 @@ $(document).ready(function () {
$('.oe_website_sale').each(function () {
var oe_website_sale = this;
- var $shippingDifferent = $("input[name='shipping_different']", oe_website_sale);
- if ($shippingDifferent.is(':checked')) {
- $(".js_shipping", oe_website_sale).show();
- }
- $shippingDifferent.change(function () {
- $(".js_shipping", oe_website_sale).toggle();
+ var $shippingDifferent = $("select[name='shipping_id']", oe_website_sale);
+ $shippingDifferent.change(function (event) {
+ var value = +$shippingDifferent.val();
+ var data = $shippingDifferent.find("option:selected").data();
+ var $snipping = $(".js_shipping", oe_website_sale);
+ var $inputs = $snipping.find("input,select");
+
+ $snipping.toggle(!!value);
+ $inputs.attr("readonly", value <= 0 ? null : "readonly" ).prop("readonly", value <= 0 ? null : "readonly" );
+
+ $inputs.each(function () {
+ $(this).val( data[$(this).attr("name")] || "" );
+ });
});
// change for css
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 67bb5443352..2f6c5ce8b82 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -916,40 +916,61 @@
-
-
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 95b8ca15f04..bb0d6e9a955 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -450,17 +450,31 @@ class res_partner(osv.Model, format_address):
def _commercial_sync_from_company(self, cr, uid, partner, context=None):
""" Handle sync of commercial fields when a new parent commercial entity is set,
as if they were related fields """
- if partner.commercial_partner_id != partner:
+ commercial_partner = partner.commercial_partner_id
+ if not commercial_partner:
+ # On child partner creation of a parent partner,
+ # the commercial_partner_id is not yet computed
+ commercial_partner_id = self._commercial_partner_compute(
+ cr, uid, [partner.id], 'commercial_partner_id', [], context=context)[partner.id]
+ commercial_partner = self.browse(cr, uid, commercial_partner_id, context=context)
+ if commercial_partner != partner:
commercial_fields = self._commercial_fields(cr, uid, context=context)
- sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
- commercial_fields, context=context)
+ sync_vals = self._update_fields_values(cr, uid, commercial_partner,
+ commercial_fields, context=context)
partner.write(sync_vals)
def _commercial_sync_to_children(self, cr, uid, partner, context=None):
""" Handle sync of commercial fields to descendants """
commercial_fields = self._commercial_fields(cr, uid, context=context)
- sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
- commercial_fields, context=context)
+ commercial_partner = partner.commercial_partner_id
+ if not commercial_partner:
+ # On child partner creation of a parent partner,
+ # the commercial_partner_id is not yet computed
+ commercial_partner_id = self._commercial_partner_compute(
+ cr, uid, [partner.id], 'commercial_partner_id', [], context=context)[partner.id]
+ commercial_partner = self.browse(cr, uid, commercial_partner_id, context=context)
+ sync_vals = self._update_fields_values(cr, uid, commercial_partner,
+ commercial_fields, context=context)
sync_children = [c for c in partner.child_ids if not c.is_company]
for child in sync_children:
self._commercial_sync_to_children(cr, uid, child, context=context)
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index bbc5b21d1fb..b34451d0396 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -250,20 +250,24 @@ class test_base(common.TransactionCase):
'parent_id': p1.id}))
p2 = self.res_partner.browse(cr, uid, self.res_partner.search(cr, uid,
[('email', '=', 'agr@sunhelm.com')])[0])
+ self.res_partner.write(cr, uid, sunhelm.id, {'child_ids': [(0, 0, {'name': 'Ulrik Greenthorn',
+ 'email': 'ugr@sunhelm.com'})]})
+ p3 = self.res_partner.browse(cr, uid, self.res_partner.search(cr, uid,
+ [('email', '=', 'ugr@sunhelm.com')])[0])
- for p in (p0, p1, p11, p2):
+ for p in (p0, p1, p11, p2, p3):
p.refresh()
self.assertEquals(p.commercial_partner_id, sunhelm, 'Incorrect commercial entity resolution')
self.assertEquals(p.vat, sunhelm.vat, 'Commercial fields must be automatically synced')
sunhelmvat = 'BE0123456789'
sunhelm.write({'vat': sunhelmvat})
- for p in (p0, p1, p11, p2):
+ for p in (p0, p1, p11, p2, p3):
p.refresh()
self.assertEquals(p.vat, sunhelmvat, 'Commercial fields must be automatically and recursively synced')
p1vat = 'BE0987654321'
p1.write({'vat': p1vat})
- for p in (sunhelm, p0, p11, p2):
+ for p in (sunhelm, p0, p11, p2, p3):
p.refresh()
self.assertEquals(p.vat, sunhelmvat, 'Sync to children should only work downstream and on commercial entities')