audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

sequence remove multi-company

Browse Source
This commit is contained in:
ivan deng
2017-11-15 23:09:55 +08:00
parent d3ca655d54
commit 4f47945278
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_product_sequence/__openerp__.py
View File

@@ -51,7 +51,7 @@
'data': [ 'data': [
# 视图 # 视图
"security/ir.model.access.csv", "security/ir.model.access.csv",
"security/security.xml", # "security/security.xml",
'views/product_template_view.xml', 'views/product_template_view.xml',
'views/product_product_view.xml', 'views/product_product_view.xml',
'views/product_internal_type_view.xml', 'views/product_internal_type_view.xml',

5
app_product_sequence/data/product_sequence.xml
View File

@@ -8,7 +8,7 @@
<field name="code">product.product</field> <field name="code">product.product</field>
<field name="prefix">P%(y)s%(month)s</field> <field name="prefix">P%(y)s%(month)s</field>
<field name="padding">5</field> <field name="padding">5</field>
<field name="company_id" eval="False"/> <!--<field name="company_id" ref="base.main_company"/>-->
<field name="initial">True</field> <field name="initial">True</field>
</record> </record>
<!-- 制造的成品 manufactured Products. --> <!-- 制造的成品 manufactured Products. -->
@@ -17,7 +17,6 @@
<field name="code">product.product</field> <field name="code">product.product</field>
<field name="prefix">D%(y)s%(month)s</field> <field name="prefix">D%(y)s%(month)s</field>
<field name="padding">5</field> <field name="padding">5</field>
<field name="company_id" eval="False"/>
<field name="initial">True</field> <field name="initial">True</field>
</record> </record>
<!-- 制造的原料 Components.--> <!-- 制造的原料 Components.-->
@@ -26,7 +25,6 @@
<field name="code">product.product</field> <field name="code">product.product</field>
<field name="prefix">C%(y)s%(month)s</field> <field name="prefix">C%(y)s%(month)s</field>
<field name="padding">5</field> <field name="padding">5</field>
<field name="company_id" eval="False"/>
<field name="initial">True</field> <field name="initial">True</field>
</record> </record>
<!-- 采购的成品 Sourced Products.--> <!-- 采购的成品 Sourced Products.-->
@@ -35,7 +33,6 @@
<field name="code">product.product</field> <field name="code">product.product</field>
<field name="prefix">S%(y)s%(month)s</field> <field name="prefix">S%(y)s%(month)s</field>
<field name="padding">5</field> <field name="padding">5</field>
<field name="company_id" eval="False"/>
<field name="initial">True</field> <field name="initial">True</field>
</record> </record>

5
app_product_sequence/models/product_internal_type.py
View File

@@ -28,8 +28,9 @@ class ProductInternalType(models.Model):
'ir.sequence', 'Link Sequence', 'ir.sequence', 'Link Sequence',
auto_join=True, required=True, domain="[('code', '=', 'product.product')]") auto_join=True, required=True, domain="[('code', '=', 'product.product')]")
sequence_prefix = fields.Char(u'Sequence Prefix', related='link_sequence.prefix', readonly=True, store=False) 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 = [ # _sql_constraints = [
# ('uniq_link_sequence', # ('uniq_link_sequence',
# 'unique(link_sequence)', # 'unique(link_sequence)',

6
app_product_sequence/security/security.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<odoo> <odoo>
<record model="ir.rule" id="sale_internal_type_comp_rule"> <record model="ir.rule" id="product_internal_type_comp_rule">
<field name="name">Sale Order Type multi-company</field> <field name="name">Product Internal Type multi-company</field>
<field name="model_id" ref="app_product_sequence.model_product_internal_type"/> <field name="model_id" ref="app_product_sequence.model_product_internal_type"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> <!--<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>-->
<field name="perm_read" eval="1"/> <field name="perm_read" eval="1"/>
<field name="perm_create" eval="1"/> <field name="perm_create" eval="1"/>
<field name="perm_write" eval="1"/> <field name="perm_write" eval="1"/>

6
app_search_range/static/src/js/tree.js
View File

@@ -69,14 +69,14 @@ ListView.include({
self.$buttons.find('.app-search').remove(); self.$buttons.find('.app-search').remove();
var app_fields = []; var app_fields = [];
// 增加参数控制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) { _.each(self.columns, function (value, key, list) {
if (value.store && value.type === "datetime" || value.type === "date") { if (value.store && value.type === "datetime" || value.type === "date") {
app_fields.push([value.name, value.string]); 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")) {
if (app_fields.length > 0) { if (app_fields.length > 0) {
self.$search_button = $(QWeb.render('odooApp.buttons', {'app_fields': app_fields})) self.$search_button = $(QWeb.render('odooApp.buttons', {'app_fields': app_fields}))
self.$search_button.find('.app_start_date').datetimepicker(datepickers_options); self.$search_button.find('.app_start_date').datetimepicker(datepickers_options);