Fixed packaged products view

This commit is contained in:
MarinaNico 2020-02-17 11:07:32 +01:00
parent 51ab6e96ef
commit eb0b4c5898
4 changed files with 28 additions and 7 deletions

View File

@ -20,9 +20,13 @@ class TemplateProductPackaging(ModelSQL, ModelView):
__name__ = 'product.template-product.packaging'
_rec_name = 'packaging_product'
packaging_product = fields.Many2One('product.template', 'Packaging Product',
required=True, ondelete='CASCADE', domain=[
required=True, ondelete='CASCADE',
states = {
'readonly': Bool(Eval('packaged_product')),
},
domain=[
('packaging', '=', True),
])
])
product = fields.Many2One('product.template', 'Product', required=True)
packaged_product = fields.Many2One('product.template', 'Packaged Product',
states = {
@ -42,8 +46,7 @@ class Template(metaclass=PoolMeta):
('bulk_type', '=', True),
],
states= {
'readonly': (~Eval('active', True) | Eval('bulk_type') == True |
Eval('packaging') == True),
'readonly': (~Eval('active', True) | Eval('bulk_type') == True),
}, depends=DEPENDS)
bulk_quantity = fields.Function(fields.Float('Bulk Quantity',
help="The amount of bulk stock in the location."),
@ -197,7 +200,11 @@ class Template(metaclass=PoolMeta):
output_template.capacity = package_product.packaging_product.capacity
output_template.save()
output_product, = output_template.products
output_product = Product()
output_product.template = output_template
output_product.save()
package_product.packaged_product = output_template
output_to_save.append(package_product)
@ -281,7 +288,7 @@ class Product(metaclass=PoolMeta):
sum_ = []
for product in output_products:
res[product.bulk_product.id] += (bulk_quantity.get(product.id,0)
* product.netweight)
* product.netweight if product.netweight else 0.0)
return res

View File

@ -69,5 +69,12 @@
<field name="perm_create" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.ui.view" id="product_packaging_view_list">
<field name="model">product.template-product.packaging</field>
<field name="type">tree</field>
<field name="priority" eval="20"/>
<field name="name">product_packaging_list</field>
</record>
</data>
</tryton>

View File

@ -0,0 +1,7 @@
<?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="bottom">
<field name="packaging_product"/>
<field name="packaged_product"/>
</tree>

View File

@ -29,7 +29,7 @@
</xpath>
<xpath expr="/form/notebook" position="inside">
<page id="packaging_products" string="Packaging Products">
<field name="packaging_products"/>
<field name="packaging_products" colspan="4"/>
<newline/>
<button name="create_packaging_products"
string="Create packaging products" colspan="2"/>