diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv index 74eee19d6ab..92ccef0ba1e 100644 --- a/addons/product/security/ir.model.access.csv +++ b/addons/product/security/ir.model.access.csv @@ -12,6 +12,7 @@ access_product_pricelist_type_user,product.pricelist.type.user,model_product_pri access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0 access_product_pricelist_version_user,product.pricelist.version.user,model_product_pricelist_version,base.group_user,1,0,0,0 access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0 +access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1 access_product_pricelist_type_partner_manager,product.pricelist.type partner manager,model_product_pricelist_type,base.group_partner_manager,1,0,0,0 access_product_pricelist_partner_manager,product.pricelist partner manager,model_product_pricelist,base.group_partner_manager,1,0,0,0 access_product_product_employee,product.product employee,model_product_product,base.group_user,1,0,0,0 diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 6fa2a43e365..bf6e19a12a3 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -493,7 +493,7 @@ class share_wizard(osv.TransientModel): # already granted for dummy, model in fields_relations: # mail.message is transversal: it should not received directly the access rights - if model.model in ['mail.message']: continue + if model.model in ['mail.message', 'mail.notification']: continue values = { 'name': _('Copied access for sharing'), 'group_id': group_id, @@ -625,7 +625,7 @@ class share_wizard(osv.TransientModel): if domain: for rel_field, model in fields_relations: # mail.message is transversal: it should not received directly the access rights - if model.model in ['mail.message']: continue + if model.model in ['mail.message', 'mail.notification']: continue related_domain = [] if not rel_field: continue for element in domain: @@ -899,8 +899,8 @@ class share_result_line(osv.osv_memory): for this in self.browse(cr, uid, ids, context=context): data = dict(dbname=cr.dbname, login=this.login, password=this.password) if this.share_wizard_id and this.share_wizard_id.action_id: - data['action_id'] = this.share_wizard_id.action_id.id - this = this.with_context(share_url_template_hash_arguments=['action_id']) + data['action'] = this.share_wizard_id.action_id.id + this = this.with_context(share_url_template_hash_arguments=['action']) result[this.id] = this.share_wizard_id.share_url_template() % data return result diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 8dd28a0410b..33e075f534b 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -25,7 +25,6 @@ access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lin access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1 access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,1,0,0 access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,1,0,0 -access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1 access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1 access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1 access_product_ul_stock_manager,product.ul stock_manager,product.model_product_ul,stock.group_stock_manager,1,1,1,1 diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index 54f74f29fbf..22131d4d53f 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -196,7 +196,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) { + ' ' + normalize_format(l10n.time_format)); case 'date': if (typeof(value) == "string") - value = instance.web.str_to_date(value.substring(0,10)); + value = instance.web.auto_str_to_date(value); return value.toString(normalize_format(l10n.date_format)); case 'time': if (typeof(value) == "string")