diff --git a/app_product_sequence/__openerp__.py b/app_product_sequence/__openerp__.py index efe2e6e2..8b2cd3c4 100644 --- a/app_product_sequence/__openerp__.py +++ b/app_product_sequence/__openerp__.py @@ -51,7 +51,7 @@ 'data': [ # 视图 "security/ir.model.access.csv", - "security/security.xml", + # "security/security.xml", 'views/product_template_view.xml', 'views/product_product_view.xml', 'views/product_internal_type_view.xml', diff --git a/app_product_sequence/data/product_sequence.xml b/app_product_sequence/data/product_sequence.xml index 8c920c19..905a7b69 100644 --- a/app_product_sequence/data/product_sequence.xml +++ b/app_product_sequence/data/product_sequence.xml @@ -8,7 +8,7 @@ product.product P%(y)s%(month)s 5 - + True @@ -17,7 +17,6 @@ product.product D%(y)s%(month)s 5 - True @@ -26,7 +25,6 @@ product.product C%(y)s%(month)s 5 - True @@ -35,7 +33,6 @@ product.product S%(y)s%(month)s 5 - True diff --git a/app_product_sequence/models/product_internal_type.py b/app_product_sequence/models/product_internal_type.py index 818d4159..abe2b70e 100644 --- a/app_product_sequence/models/product_internal_type.py +++ b/app_product_sequence/models/product_internal_type.py @@ -28,8 +28,9 @@ class ProductInternalType(models.Model): 'ir.sequence', 'Link Sequence', auto_join=True, required=True, domain="[('code', '=', 'product.product')]") sequence_prefix = fields.Char(u'Sequence Prefix', related='link_sequence.prefix', readonly=True, store=False) - company_id = fields.Many2one('res.company') - + # company_id = fields.Many2one( + # 'res.company', 'Company', + # default=lambda self: self.env.user.company_id.id, index=1) # _sql_constraints = [ # ('uniq_link_sequence', # 'unique(link_sequence)', diff --git a/app_product_sequence/security/security.xml b/app_product_sequence/security/security.xml index 97b97439..a9f6dc2e 100644 --- a/app_product_sequence/security/security.xml +++ b/app_product_sequence/security/security.xml @@ -1,9 +1,9 @@ - - Sale Order Type multi-company + + Product Internal Type multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + diff --git a/app_search_range/static/src/js/tree.js b/app_search_range/static/src/js/tree.js index 90136649..48dbbddc 100644 --- a/app_search_range/static/src/js/tree.js +++ b/app_search_range/static/src/js/tree.js @@ -69,14 +69,14 @@ ListView.include({ self.$buttons.find('.app-search').remove(); var app_fields = []; - _.each(self.columns, function(value, key, list){ - if (value.store && value.type === "datetime" || value.type === "date") { - app_fields.push([value.name, value.string]); - } - }); // 增加参数控制app_show_search_date new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_date']], ['value']]).then(function (show) { if (show.length >= 1 && (show[0]['value'] == "True")) { + _.each(self.columns, function (value, key, list) { + if (value.store && value.type === "datetime" || value.type === "date") { + app_fields.push([value.name, value.string]); + } + }); if (app_fields.length > 0) { self.$search_button = $(QWeb.render('odooApp.buttons', {'app_fields': app_fields})) self.$search_button.find('.app_start_date').datetimepicker(datepickers_options);