Remove distribution template template
This commit is contained in:
Raimon Esteve
parent
e6ee999df6
commit
ab8fa0bb68
|
|
@ -47,7 +47,6 @@ def register():
|
|||
production.ProductionCostPriceDistribution,
|
||||
production.ProductionProductionCostPriceDistribution,
|
||||
production.ProductionCostPriceDistributionTemplate,
|
||||
production.ProductionCostPriceDistributionTemplateTemplate,
|
||||
production.ProductionCostPriceDistributionTemplateProductTemplate,
|
||||
production.ProductionDistributionCostPriceTemplate,
|
||||
production.ProductionCostPriceDistributionTemplateProductionTemplateAsk,
|
||||
|
|
|
|||
|
|
@ -147,21 +147,24 @@ class Production(metaclass=PoolMeta):
|
|||
'product.template', None, 'Allowed Output Products', readonly=True),
|
||||
'on_change_with_allowed_output_products',
|
||||
setter='set_allowed_products')
|
||||
output_templates = fields.Function(fields.Many2Many('product.template',
|
||||
None, None, "Output Templates"), 'on_change_with_output_templates')
|
||||
cost_distributions = fields.Many2Many(
|
||||
'production-production.distribution.cost_price',
|
||||
'production', 'cost_distribution', "Cost Distributions",
|
||||
states={
|
||||
'readonly': Eval('state').in_(['cancelled', 'done']),
|
||||
}, domain=[
|
||||
('template', 'in', Eval('output_templates')),
|
||||
], depends=['state', 'output_templates'])
|
||||
('id', 'in', Eval('cost_distribution_templates')),
|
||||
], depends=['state', 'cost_distribution_templates'])
|
||||
cost_distribution_template = fields.Many2One(
|
||||
'production.cost_price.distribution.template', "Cost Distribution Template",
|
||||
'production.cost_price.distribution.template',
|
||||
"Cost Distribution Template",
|
||||
states={
|
||||
'readonly': Eval('state').in_(['cancelled', 'done']),
|
||||
}, depends=['state'])
|
||||
cost_distribution_templates = fields.Function(
|
||||
fields.Many2Many('production.cost_price.distribution',
|
||||
None, None, "Cost Distribution Templates"),
|
||||
'on_change_with_cost_distribution_templates')
|
||||
|
||||
@classmethod
|
||||
def set_allowed_products(cls, productions, name, value):
|
||||
|
|
@ -187,9 +190,11 @@ class Production(metaclass=PoolMeta):
|
|||
return []
|
||||
return [x.id for x in self.production_template.outputs]
|
||||
|
||||
@fields.depends('outputs')
|
||||
def on_change_with_output_templates(self, name=None):
|
||||
return [s.product.template.id for s in self.outputs if s.product]
|
||||
@fields.depends('cost_distribution_template',
|
||||
'_parent_cost_distribution_template.cost_distribution_templates')
|
||||
def on_change_with_cost_distribution_templates(self, name=None):
|
||||
if self.cost_distribution_template:
|
||||
return [s.id for s in self.cost_distribution_template.cost_distribution_templates]
|
||||
|
||||
@classmethod
|
||||
def validate(cls, productions):
|
||||
|
|
@ -280,12 +285,23 @@ class Production(metaclass=PoolMeta):
|
|||
od.production = production
|
||||
outputs.append(od)
|
||||
|
||||
values = {}
|
||||
if (not production.cost_distribution_template
|
||||
and production.production_template
|
||||
and production.production_template.cost_distribution_template):
|
||||
to_write.extend(([production], {
|
||||
'cost_distribution_template':
|
||||
production.production_template.cost_distribution_template,
|
||||
}))
|
||||
values['cost_distribution_template'] = production.production_template.cost_distribution_template
|
||||
if not production.cost_distributions:
|
||||
if production.cost_distribution_template:
|
||||
cost_distribution_template = production.cost_distribution_template
|
||||
elif production.production_template:
|
||||
cost_distribution_template = production.production_template.cost_distribution_template
|
||||
else:
|
||||
cost_distribution_template = None
|
||||
if cost_distribution_template:
|
||||
values['cost_distributions'] = [('add', [
|
||||
c.id for c in cost_distribution_template.cost_distribution_templates])]
|
||||
if values:
|
||||
to_write.extend(([production], values))
|
||||
|
||||
OutputDistribution.delete(delete_outputs)
|
||||
OutputDistribution.save(outputs)
|
||||
|
|
@ -540,20 +556,6 @@ class ProductionCostPriceDistribution(ModelSQL, ModelView):
|
|||
cls.template.domain = [('type', 'in', BOMInput.get_product_types())]
|
||||
|
||||
|
||||
class ProductionCostPriceDistributionTemplateTemplate(ModelSQL, ModelView):
|
||||
"Production Distribution Cost Price Template - Template"
|
||||
__name__ = 'production.cost_price.distribution.template.template'
|
||||
template = fields.Many2One('product.template', "Template", required=True,
|
||||
ondelete='RESTRICT')
|
||||
percentatge = fields.Numeric("Percentatge", digits=(16, 4), required=True)
|
||||
|
||||
@classmethod
|
||||
def __setup__(cls):
|
||||
BOMInput = Pool().get('production.bom.input')
|
||||
super(ProductionCostPriceDistributionTemplateTemplate, cls).__setup__()
|
||||
cls.template.domain = [('type', 'in', BOMInput.get_product_types())]
|
||||
|
||||
|
||||
class ProductionCostPriceDistributionTemplate(ModelSQL, ModelView):
|
||||
"Production Cost Price Distribution Template"
|
||||
__name__ = 'production.cost_price.distribution.template'
|
||||
|
|
@ -562,7 +564,7 @@ class ProductionCostPriceDistributionTemplate(ModelSQL, ModelView):
|
|||
"Production Template", required=True)
|
||||
cost_distribution_templates = fields.Many2Many(
|
||||
'production-production.distribution.cost_price.template',
|
||||
'cost_distribution_template', 'cost_distribution_template_template',
|
||||
'cost_distribution_template', 'cost_distribution',
|
||||
"Cost Distribution Template")
|
||||
|
||||
@classmethod
|
||||
|
|
@ -589,9 +591,9 @@ class ProductionDistributionCostPriceTemplate(ModelSQL):
|
|||
'production.cost_price.distribution.template',
|
||||
"Cost Distribution Template", ondelete='CASCADE',
|
||||
required=True, select=True)
|
||||
cost_distribution_template_template = fields.Many2One(
|
||||
'production.cost_price.distribution.template.template',
|
||||
"Cost Distribution Template - Template",
|
||||
cost_distribution = fields.Many2One(
|
||||
'production.cost_price.distribution',
|
||||
"Cost Distribution",
|
||||
ondelete='CASCADE', required=True, select=True)
|
||||
|
||||
|
||||
|
|
@ -611,7 +613,7 @@ class ProductionCostPriceDistributionTemplateProductionTemplateAsk(ModelView):
|
|||
__name__ = 'production.cost_price.distribution.template.ask'
|
||||
name = fields.Char("Name", required=True)
|
||||
cost_distribution_templates = fields.One2Many(
|
||||
'production.cost_price.distribution.template.template',
|
||||
'production.cost_price.distribution',
|
||||
None, "Cost Distributions")
|
||||
|
||||
|
||||
|
|
@ -630,7 +632,7 @@ class ProductionCostPriceDistributionTemplateProductionTemplate(Wizard):
|
|||
def do_create_cost_distributions(self, action):
|
||||
pool = Pool()
|
||||
Template = pool.get('production.cost_price.distribution.template')
|
||||
DistributionTemplate = pool.get('production.cost_price.distribution.template.template')
|
||||
Distribution = pool.get('production.cost_price.distribution')
|
||||
|
||||
to_create = []
|
||||
for record in self.records:
|
||||
|
|
@ -639,7 +641,7 @@ class ProductionCostPriceDistributionTemplateProductionTemplate(Wizard):
|
|||
tpl.production_template = record
|
||||
cost_distributions = []
|
||||
for cost_distribution in self.ask.cost_distribution_templates:
|
||||
dt = DistributionTemplate()
|
||||
dt = Distribution()
|
||||
dt.template = cost_distribution.template
|
||||
dt.percentatge = cost_distribution.percentatge
|
||||
cost_distributions.append(dt)
|
||||
|
|
@ -663,16 +665,12 @@ class ProductionCostPriceDistributionTemplateProductionTemplate(Wizard):
|
|||
active_id = context.get('active_id')
|
||||
if active_id:
|
||||
ptpl = ProductionTemplate(active_id)
|
||||
cost_distributions = []
|
||||
# TODO ptpl.cost_distribution_templates or ptpl.cost_distribution_template
|
||||
for cdt in ptpl.cost_distribution_templates:
|
||||
for c in cdt.cost_distribution_templates:
|
||||
# dt = DistributionTemplate()
|
||||
# dt.template = c.template
|
||||
# dt.percentatge = c.percentatge
|
||||
if ptpl.cost_distribution_template:
|
||||
cost_distributions = []
|
||||
for c in ptpl.cost_distribution_template.cost_distribution_templates:
|
||||
cost_distributions.append({
|
||||
'template': c.template.id,
|
||||
'percentatge': c.percentatge,
|
||||
})
|
||||
default['cost_distribution_templates'] = cost_distributions
|
||||
default['cost_distribution_templates'] = cost_distributions
|
||||
return default
|
||||
|
|
|
|||
|
|
@ -110,55 +110,6 @@
|
|||
<field name="name">production_list</field>
|
||||
</record>
|
||||
|
||||
<!-- production cost distribution -->
|
||||
<record model="ir.ui.view" id="production_cost_price_distribution_view_form">
|
||||
<field name="model">production.cost_price.distribution</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">production_cost_price_distribution_form</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="production_cost_price_distribution_view_tree">
|
||||
<field name="model">production.cost_price.distribution</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="name">production_cost_price_distribution_tree</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.action.act_window" id="act_production_cost_price_distribution_tree">
|
||||
<field name="name">Cost Price Distribution</field>
|
||||
<field name="res_model">production.cost_price.distribution</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_price_distribution_tree_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view" ref="production_cost_price_distribution_view_tree"/>
|
||||
<field name="act_window" ref="act_production_cost_price_distribution_tree"/>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_price_distribution_view2">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="view" ref="production_cost_price_distribution_view_form"/>
|
||||
<field name="act_window" ref="act_production_cost_price_distribution_tree"/>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
parent="production.menu_configuration"
|
||||
action="act_production_cost_price_distribution_tree"
|
||||
sequence="50"
|
||||
id="menu_act_production_cost_price_distribution"/>
|
||||
|
||||
<record model="ir.model.access" id="access_production_cost_price_distribution">
|
||||
<field name="model" search="[('model', '=', 'production.cost_price.distribution')]"/>
|
||||
<field name="perm_read" eval="True"/>
|
||||
<field name="perm_write" eval="False"/>
|
||||
<field name="perm_create" eval="False"/>
|
||||
<field name="perm_delete" eval="False"/>
|
||||
</record>
|
||||
<record model="ir.model.access" id="access_production_cost_price_distribution_admin">
|
||||
<field name="model" search="[('model', '=', 'production.cost_price.distribution')]"/>
|
||||
<field name="group" ref="production.group_production_admin"/>
|
||||
<field name="perm_read" eval="True"/>
|
||||
<field name="perm_write" eval="True"/>
|
||||
<field name="perm_create" eval="True"/>
|
||||
<field name="perm_delete" eval="True"/>
|
||||
</record>
|
||||
|
||||
<!-- production.cost_price.distribution.template -->
|
||||
<record model="ir.ui.view" id="production_cost_distribution_template_view_form">
|
||||
<field name="model">production.cost_price.distribution.template</field>
|
||||
|
|
@ -172,7 +123,7 @@
|
|||
</record>
|
||||
|
||||
<record model="ir.action.act_window" id="act_production_cost_distribution_template_tree">
|
||||
<field name="name">Cost Price Distribution Template</field>
|
||||
<field name="name">Templates Cost Price Distribution</field>
|
||||
<field name="res_model">production.cost_price.distribution.template</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_distribution_template_tree_view1">
|
||||
|
|
@ -208,48 +159,48 @@
|
|||
<field name="perm_delete" eval="True"/>
|
||||
</record>
|
||||
|
||||
<!-- production cost distribution template - template -->
|
||||
<record model="ir.ui.view" id="production_cost_price_distribution_template_template_view_form">
|
||||
<field name="model">production.cost_price.distribution.template.template</field>
|
||||
<!-- production cost price distribution -->
|
||||
<record model="ir.ui.view" id="production_cost_price_distribution_view_form">
|
||||
<field name="model">production.cost_price.distribution</field>
|
||||
<field name="type">form</field>
|
||||
<field name="name">production_cost_price_distribution_template_template_form</field>
|
||||
<field name="name">production_cost_price_distribution_form</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="production_cost_price_distribution_template_template_view_tree">
|
||||
<field name="model">production.cost_price.distribution.template.template</field>
|
||||
<record model="ir.ui.view" id="production_cost_price_distribution_view_tree">
|
||||
<field name="model">production.cost_price.distribution</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="name">production_cost_price_distribution_template_template_tree</field>
|
||||
<field name="name">production_cost_price_distribution_tree</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.action.act_window" id="act_production_cost_price_distribution_template_template_tree">
|
||||
<field name="name">Cost Price Distribution Template - Template</field>
|
||||
<field name="res_model">production.cost_price.distribution.template.template</field>
|
||||
<record model="ir.action.act_window" id="act_production_cost_price_distribution_tree">
|
||||
<field name="name">Cost Price Distribution</field>
|
||||
<field name="res_model">production.cost_price.distribution</field>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_price_distribution_template_template_tree_view1">
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_price_distribution_tree_view1">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="view" ref="production_cost_price_distribution_template_template_view_tree"/>
|
||||
<field name="act_window" ref="act_production_cost_price_distribution_template_template_tree"/>
|
||||
<field name="view" ref="production_cost_price_distribution_view_tree"/>
|
||||
<field name="act_window" ref="act_production_cost_price_distribution_tree"/>
|
||||
</record>
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_price_distribution_template_template_view2">
|
||||
<record model="ir.action.act_window.view" id="act_production_cost_price_distribution_view2">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="view" ref="production_cost_price_distribution_template_template_view_form"/>
|
||||
<field name="act_window" ref="act_production_cost_price_distribution_template_template_tree"/>
|
||||
<field name="view" ref="production_cost_price_distribution_view_form"/>
|
||||
<field name="act_window" ref="act_production_cost_price_distribution_tree"/>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
parent="menu_act_production_cost_distribution_template"
|
||||
action="act_production_cost_price_distribution_template_template_tree"
|
||||
action="act_production_cost_price_distribution_tree"
|
||||
sequence="50"
|
||||
id="menu_act_production_cost_distribution_template_template"/>
|
||||
id="menu_act_production_cost_price_distribution"/>
|
||||
|
||||
<record model="ir.model.access" id="access_production_cost_price_distribution_template_template">
|
||||
<field name="model" search="[('model', '=', 'production.cost_price.distribution.template.template')]"/>
|
||||
<record model="ir.model.access" id="access_production_cost_price_distribution">
|
||||
<field name="model" search="[('model', '=', 'production.cost_price.distribution')]"/>
|
||||
<field name="perm_read" eval="True"/>
|
||||
<field name="perm_write" eval="False"/>
|
||||
<field name="perm_create" eval="False"/>
|
||||
<field name="perm_delete" eval="False"/>
|
||||
</record>
|
||||
<record model="ir.model.access" id="access_production_cost_price_distribution_template_template_admin">
|
||||
<field name="model" search="[('model', '=', 'production.cost_price.distribution.template.template')]"/>
|
||||
<record model="ir.model.access" id="access_production_cost_price_distribution_admin">
|
||||
<field name="model" search="[('model', '=', 'production.cost_price.distribution')]"/>
|
||||
<field name="group" ref="production.group_production_admin"/>
|
||||
<field name="perm_read" eval="True"/>
|
||||
<field name="perm_write" eval="True"/>
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<form>
|
||||
<label name="template"/>
|
||||
<field name="template"/>
|
||||
<label name="percentatge"/>
|
||||
<field name="percentatge" factor="100"/>
|
||||
</form>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<tree editable="1">
|
||||
<field name="template" expand="1"/>
|
||||
<field name="percentatge" factor="100">
|
||||
<suffix name="percentatge" string="%"/>
|
||||
</field>
|
||||
</tree>
|
||||
|
|
@ -20,6 +20,7 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="cost_distribution_template"/>
|
||||
<newline/>
|
||||
<field name="cost_distributions" colspan="4"/>
|
||||
<field name="cost_distribution_templates" invisible="1"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</data>
|
||||
|
|
|
|||
Loading…
Reference in New Issue