(standard)Output Purchase Tax @ 4%
diff --git a/addons/product/product.py b/addons/product/product.py
index 825ec1873a8..14bf0231c0a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -1083,8 +1083,7 @@ class product_product(osv.osv):
name = variant and "%s (%s)" % (product.name, variant) or product.name
sellers = []
if partner_ids:
- if variant:
- sellers = [x for x in product.seller_ids if (x.name.id in partner_ids) and (x.product_id == product)]
+ sellers = [x for x in product.seller_ids if (x.name.id in partner_ids) and (x.product_id == product)]
if not sellers:
sellers = [x for x in product.seller_ids if (x.name.id in partner_ids) and not x.product_id]
if sellers:
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index a604764fcfb..f1ba88a1f3e 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -644,7 +644,7 @@ class resource_calendar_attendance(osv.osv):
'date_to': fields.date('End Date'),
'hour_from' : fields.float('Work from', required=True, help="Start and End time of working.", select=True),
'hour_to' : fields.float("Work to", required=True),
- 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
+ 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True, ondelete='cascade'),
}
_order = 'dayofweek, hour_from'
diff --git a/addons/web_planner/models/web_planner.py b/addons/web_planner/models/web_planner.py
index ae16d429b30..a88720b9506 100644
--- a/addons/web_planner/models/web_planner.py
+++ b/addons/web_planner/models/web_planner.py
@@ -65,6 +65,8 @@ class Planner(models.Model):
module = self.env['ir.module.module'].sudo().search([('name', '=', module_name)], limit=1)
if module:
params['id'] = module.id
+ else:
+ return "#show_enterprise"
return "/web#%s" % (urlencode(params),)
@api.model
diff --git a/addons/web_planner/static/src/js/web_planner_common.js b/addons/web_planner/static/src/js/web_planner_common.js
index 93bcf2bc775..ad27739f2c5 100644
--- a/addons/web_planner/static/src/js/web_planner_common.js
+++ b/addons/web_planner/static/src/js/web_planner_common.js
@@ -49,6 +49,7 @@ var PlannerDialog = Widget.extend({
category_selector: 'div[menu-category-id]',
events: {
'click li a[href^="#"]:not([data-toggle="collapse"])': 'change_page',
+ 'click a[href^="#show_enterprise"]': 'show_enterprise',
'click button.mark_as_done': 'click_on_done',
'click a.btn-next': 'change_to_next_page',
'click .o_planner_close_block span': 'close_modal',
@@ -420,7 +421,40 @@ var PlannerDialog = Widget.extend({
destroy: function() {
this.$el.modal('hide');
return this._super.apply(this, arguments);
- }
+ },
+ show_enterprise: function(ev) {
+ ev.preventDefault();
+ var message = $(QWeb.render('EnterpriseUpgrade'));
+ var buttons = [
+ {
+ text: _t("Upgrade now"),
+ classes: 'btn-primary',
+ close: true,
+ click: this.confirm_upgrade,
+ },
+ {
+ text: _t("Cancel"),
+ close: true,
+ },
+ ];
+ var dialog = new Dialog(this, {
+ size: 'medium',
+ buttons: buttons,
+ $content: $('', {
+ html: message,
+ }),
+ title: _t("Odoo Enterprise"),
+ }).open();
+
+ // force dialog to be hover the planner
+ dialog.$el.parents('.modal').css('z-index', 1052);
+ return dialog;
+ },
+ confirm_upgrade: function() {
+ new Model("res.users").call("search_count", [[["share", "=", false]]]).then(function(data) {
+ window.location = "https://www.odoo.com/odoo-enterprise/upgrade?utm_medium=community_upgrade&num_users=" + data;
+ });
+ },
});
return {
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 3cc9c918152..c4d17264d69 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -360,7 +360,7 @@ class HttpCase(TransactionCase):
_logger.info("phantomjs: %s", line)
if line == "ok":
- break
+ return True
def phantom_run(self, cmd, timeout):
_logger.info('phantom_run executing %s', ' '.join(cmd))
@@ -373,8 +373,9 @@ class HttpCase(TransactionCase):
phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=None)
except OSError:
raise unittest.SkipTest("PhantomJS not found")
+ result = False
try:
- self.phantom_poll(phantom, timeout)
+ result = self.phantom_poll(phantom, timeout)
finally:
# kill phantomjs if phantom.exit() wasn't called in the test
if phantom.poll() is None:
@@ -383,6 +384,10 @@ class HttpCase(TransactionCase):
self._wait_remaining_requests()
# we ignore phantomjs return code as we kill it as soon as we have ok
_logger.info("phantom_run execution finished")
+ self.assertTrue(
+ result,
+ "PhantomJS test completed without reporting success; "
+ "the log may contain errors or hints.")
def _wait_remaining_requests(self):
t0 = int(time.time())