add modules to use product packaging

packaging_extended: to use uom in packaging
purchase_packaging: to improve supplierinfo with purchase uom and packaging and use them in purchase order
sale_packaging: to use packaging uom in sale order line
This commit is contained in:
Laetitia Gangloff
2015-07-23 10:46:00 +02:00
committed by Thomas Binsfeld
parent 0d3daff3f1
commit ca4e313d38
10 changed files with 532 additions and 0 deletions

View File

@@ -0,0 +1,70 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:alt: License: AGPL-3
Purchase Packaging
===========
- Use packaging in supplierinfo
- Use uom set in the packaging instead of purchase uom for purchase
- Add minimum quantity measure unit in supplierinfo
- On purchase order line compute the quantity with the quantity and unit of
measure
Installation
============
To install this module, you need to:
* Click on install button
Configuration
=============
To configure this module, you need to:
* on product packaging define the unit of measure to use.
* on supplier info define the packaging and minimum unit of measure quantity
to use.
* use product packaging in purchase order to use the link unit of measure
Usage
=====
For further information, please visit:
* https://www.odoo.com/forum/help-1
Bug Tracker
===========
Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
`here <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20purchase_packaging%0Aversion:%200.1%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Credits
=======
Contributors
------------
* Laetitia Gangloff <laetitia.gangloff@acsone.eu>
* Laurent Mignon <laurent.mignon@acsone.eu>
Maintainer
----------
.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org
This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
To contribute to this module, please visit http://odoo-community.org.

5
purchase_packaging/__init__.py Executable file
View File

@@ -0,0 +1,5 @@
# -*- coding: utf-8 -*-
from . import (
models,
)

View File

@@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Authors: Laetitia Gangloff
# Copyright (c) 2015 Acsone SA/NV (http://www.acsone.eu)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
"name": "Purchase Packaging",
"version": "0.1",
'author': "Acsone, Odoo Community Association (OCA)",
"category": "Other",
"website": "http://www.acsone.eu",
'summary': "In purchase, use package",
"depends": ["product",
"purchase",
"packaging_extended",
],
"data": ["views/product_views.xml",
"views/purchase_views.xml",
],
"license": "AGPL-3",
"installable": True,
"application": False,
}

View File

@@ -0,0 +1,4 @@
# -*- coding: utf-8 -*-
from . import product
from . import purchase

View File

@@ -0,0 +1,49 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Authors: Laetitia Gangloff
# Copyright (c) 2015 Acsone SA/NV (http://www.acsone.eu)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp import api, fields, models
class ProductSupplierinfo(models.Model):
_inherit = "product.supplierinfo"
@api.model
def _default_min_qty_uom_id(self):
return self.env.ref('product.product_uom_unit')
packaging_id = fields.Many2one('product.packaging', 'Logisitical Units')
product_uom = fields.Many2one(compute='_compute_product_uom',
string="Supplier Unit of Measure",
readonly=True)
min_qty_uom_id = fields.Many2one('product.uom',
'Minimal Unit of Measure Quantity',
required=True,
default=_default_min_qty_uom_id)
@api.one
@api.depends('product_tmpl_id', 'packaging_id')
def _compute_product_uom(self):
""" Set product_uom as a computed field instead of a related field.
To use uom of link packaging
"""
self.product_uom = self.packaging_id.uom_id or \
self.product_tmpl_id.uom_po_id

View File

@@ -0,0 +1,157 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Authors: Laetitia Gangloff
# Copyright (c) 2015 Acsone SA/NV (http://www.acsone.eu)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp import api, fields, models
import openerp.addons.decimal_precision as dp
class PurchaseOrder(models.Model):
_inherit = "purchase.order"
@api.cr_uid_context
def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id,
group_id, context=None):
""" Set product_packaging on stock move
"""
result = super(PurchaseOrder, self)._prepare_order_line_move(
cr, uid, order, order_line, picking_id, group_id,
context=context)
if order_line.packaging_id:
for res in result:
res['product_packaging'] = order_line.packaging_id.id
return result
class PurchaseOrderLine(models.Model):
_inherit = "purchase.order.line"
@api.model
def _default_product_purchase_uom_id(self):
return self.env.ref('product.product_uom_unit')
product_tmpl_id = fields.Many2one(related='product_id.product_tmpl_id',
comodel_name='product.template')
packaging_id = fields.Many2one('product.packaging', 'Packaging')
product_purchase_qty = fields.Float(
'Purchase quantity',
digits_compute=dp.get_precision('Product Unit of Measure'),
required=True, default=lambda *a: 1.0)
product_purchase_uom_id = fields.Many2one(
'product.uom', 'Purchase Unit of Measure', required=True,
default=_default_product_purchase_uom_id)
product_qty = fields.Float(
compute="_compute_product_qty", string='Quantity')
@api.one
@api.depends('product_purchase_uom_id', 'product_purchase_qty')
def _compute_product_qty(self):
"""
Compute the total quantity
"""
uom_obj = self.env['product.uom']
to_uom = uom_obj.search(
[('category_id', '=', self.product_purchase_uom_id.category_id.id),
('uom_type', '=', 'reference')], limit=1)
self.product_qty = uom_obj._compute_qty(
self.product_purchase_uom_id.id,
self.product_purchase_qty,
to_uom.id)
@api.onchange("packaging_id")
def _onchange_packaging_id(self):
if self.packaging_id:
self.product_uom = self.packaging_id.uom_id
@api.cr_uid_context
def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty,
uom_id, partner_id, date_order=False,
fiscal_position_id=False, date_planned=False,
name=False, price_unit=False, state='draft',
context=None):
""" set domain on product_purchase_uom_id and packaging_id
if there is no qty (first pass),
set the first packagigng, purchase_uom and purchase_qty
"""
product_product = self.pool['product.product']
product_purchase_qty = 0
product_purchase_uom_id = False
packaging_id = False
new_uom_id = False
domain = {}
if product_id and partner_id:
product = product_product.browse(cr, uid, product_id,
context=context)
first = True
packaging_ids = []
po_uom_ids = []
domain['packaging_id'] = [('id', 'in', packaging_ids)]
domain['product_purchase_uom_id'] = [('id', 'in', po_uom_ids)]
for supplier in product.seller_ids:
if (supplier.name.id == partner_id):
if first:
product_purchase_qty = supplier.min_qty
product_purchase_uom_id = supplier.min_qty_uom_id.id
new_uom_id = supplier.product_uom.id
if supplier.packaging_id:
packaging_id = supplier.packaging_id.id
first = False
po_uom_ids.append(supplier.min_qty_uom_id.id)
if supplier.packaging_id:
packaging_ids.append(supplier.packaging_id.id)
uom_id = new_uom_id if not qty else uom_id
res = super(PurchaseOrderLine, self).onchange_product_id(
cr, uid, ids, pricelist_id, product_id, qty, uom_id,
partner_id, date_order=date_order,
fiscal_position_id=fiscal_position_id, date_planned=date_planned,
name=name, price_unit=price_unit, state=state, context=context)
if not qty:
res['value']['product_purchase_qty'] = product_purchase_qty
res['value']['product_purchase_uom_id'] = product_purchase_uom_id
res['value']['packaging_id'] = packaging_id
if domain:
if res.get('domain'):
res['domain'].update(domain)
else:
res['domain'] = domain
return res
@api.model
def update_vals(self, vals):
"""
When packaging_id is set, uom_id is readonly,
so we need to reset the uom value in the vals dict
"""
if vals.get('packaging_id'):
vals['product_uom'] = self.env['product.packaging'].browse(
vals['packaging_id']).uom_id.id
return vals
@api.model
def create(self, vals):
return super(PurchaseOrderLine, self).create(self.update_vals(vals))
@api.multi
def write(self, vals):
return super(PurchaseOrderLine, self).write(self.update_vals(vals))

View File

@@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
from . import test_packaging

View File

@@ -0,0 +1,104 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Authors: Laetitia Gangloff
# Copyright (c) 2015 Acsone SA/NV (http://www.acsone.eu)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import openerp.tests.common as common
class TestPackaging(common.TransactionCase):
def setUp(self):
""" Create a packagings with uom product_uom_dozen on
* product_product_34 (uom is product_uom_unit)
"""
super(TestPackaging, self).setUp()
self.product_packaging_34 = self.env['product.packaging'].create(
{'product_tmpl_id': self.env.ref('product.product_product_34'
).product_tmpl_id.id,
'uom_id': self.env.ref('product.product_uom_dozen').id})
self.sp_30 = self.env.ref('product.product_supplierinfo_30')
def test_supplierinfo_product_uom(self):
""" Check product_uom of product_supplierinfo_30 is product_uom_unit
Set packaging_id product_packaging_34 on product_supplierinfo_30
Check product_uom of product_supplierinfo_30 is product_uom_dozen
"""
self.assertEqual(self.sp_30.product_uom.id,
self.env.ref('product.product_uom_unit').id)
self.sp_30.packaging_id = self.product_packaging_34
self.assertEqual(self.sp_30.product_uom.id,
self.env.ref('product.product_uom_dozen').id)
def test_po_line(self):
""" On supplierinfo set product_uom_8 as min_qty_uom_id
On supplierinfo set 2 as min_qty
Create purchase order line with product product_product_34
Check packaging_id is product_packaging_34
Check product_purchase_uom_id is product_uom_8
Check product_purchase_qty is 2
Check product_qty is 8*2 = 16
Check price_unit is 12*38 = 456
Check product_uom is product_uom_dozen
Confirm po
Check stock move packaging is product_packaging_34
Check stock move product_uom is product_uom_dozen
Check stock move product_qty is 16
"""
product_uom_8 = self.env['product.uom'].create(
{'category_id': self.env.ref('product.product_uom_categ_unit').id,
'name': 'COL8',
'factor_inv': 8,
'uom_type': 'bigger'
})
self.sp_30.min_qty_uom_id = product_uom_8
self.sp_30.min_qty = 2
self.sp_30.packaging_id = self.product_packaging_34
po = self.env['purchase.order'].create(
{'partner_id': self.env.ref('base.res_partner_16').id,
'location_id': self.env.ref('stock.stock_location_stock').id,
'pricelist_id': self.env.ref('purchase.list0').id
})
vals = self.env['purchase.order.line'].onchange_product_id(
[],
po.pricelist_id.id, self.env.ref('product.product_product_34').id,
0, False, po.partner_id.id, date_order=po.date_order,
fiscal_position_id=po.fiscal_position.id, date_planned=False,
name=False, price_unit=False, state=po.state)
vals['value']['order_id'] = po.id
vals['value']['product_id'] = self.env.ref(
'product.product_product_34').id
po_line = self.env['purchase.order.line'].create(vals['value'])
self.assertEqual(po_line.packaging_id.id,
self.product_packaging_34.id)
self.assertEqual(po_line.product_purchase_uom_id.id, product_uom_8.id)
self.assertAlmostEqual(po_line.product_purchase_qty, 2)
self.assertAlmostEqual(po_line.product_qty, 16)
self.assertAlmostEqual(po_line.price_unit, 456)
self.assertEqual(po_line.product_uom.id,
self.env.ref('product.product_uom_dozen').id)
po.signal_workflow('purchase_confirm')
sm = po.picking_ids[0].move_lines[0]
self.assertEqual(sm.product_packaging.id,
self.product_packaging_34.id)
self.assertEqual(sm.product_uom.id,
self.env.ref('product.product_uom_dozen').id)
self.assertAlmostEqual(sm.product_uom_qty, 16)

View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="product_template_view_form_inherit_purchase_packaging" model="ir.ui.view">
<field name="name">product.template.common.form (purchase_packaging)</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_form_view"/>
<field name="arch" type="xml">
<field name="seller_ids" position="attributes">
<attribute name="context">
{'default_product_tmpl_id': id}</attribute>
</field>
</field>
</record>
<record id="product_supplierinfo_view_tree_inherit_purchase_packaging" model="ir.ui.view">
<field name="name">product.supplierinfo.tree.view" (purchase_packaging)</field>
<field name="model">product.supplierinfo</field>
<field name="inherit_id" ref="product.product_supplierinfo_tree_view"/>
<field name="arch" type="xml">
<field name="min_qty" position="after">
<field name="min_qty_uom_id" groups="product.group_uom"/>
<field name="packaging_id" groups="product.group_stock_packaging"/>
</field>
</field>
</record>
<record id="product_supplierinfo_view_form_inherit_purchase_packaging" model="ir.ui.view">
<field name="name">product.supplierinfo.form.view (purchase_packaging)</field>
<field name="model">product.supplierinfo</field>
<field name="inherit_id" ref="product.product_supplierinfo_form_view"/>
<field name="arch" type="xml">
<field name="min_qty" position="after">
<field name="min_qty_uom_id" groups="product.group_uom"/>
</field>
<field name="product_uom" position="after">
<field name="packaging_id" domain="[('product_tmpl_id', '=', product_tmpl_id)]" groups="product.group_stock_packaging"/>
</field>
<field name="delay" position="after">
<field name="product_tmpl_id" invisible="1"/>
</field>
</field>
</record>
</data>
</openerp>

View File

@@ -0,0 +1,54 @@
<?xml version="1.0"?>
<openerp>
<data>
<record id="purchase_order_view_form_inherit_purchase_packaging" model="ir.ui.view">
<field name="name">purchase.order.form (purchase_packaging)</field>
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@string='Products']//field[@name='order_line']/tree[@string='Purchase Order Lines']/field[@name='product_id']" position="after">
<field name="product_tmpl_id" invisible="1"/>
<field name="packaging_id" domain="[('product_tmpl_id','=',product_tmpl_id)]" groups="product.group_stock_packaging"/>
</xpath>
<xpath expr="//page[@string='Products']//field[@name='order_line']/tree[@string='Purchase Order Lines']/field[@name='product_qty']" position="attributes">
<attribute name="readonly">1</attribute>
</xpath>
<xpath expr="//page[@string='Products']//field[@name='order_line']/tree[@string='Purchase Order Lines']/field[@name='product_qty']" position="before">
<field name="product_purchase_qty"/>
<field name="product_purchase_uom_id" groups="product.group_uom"/>
</xpath>
<xpath expr="//page[@string='Products']//field[@name='order_line']/tree[@string='Purchase Order Lines']/field[@name='product_uom']" position="attributes">
<attribute name="attrs">{'readonly' : [('packaging_id', '!=', False)]}</attribute>
</xpath>
</data>
</field>
</record>
<record id="purchase_order_line_view_form_inherit_purchase_packaging" model="ir.ui.view">
<field name="name">purchase.order.line.form (purchase_packaging)</field>
<field name="model">purchase.order.line</field>
<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
<field name="arch" type="xml">
<data>
<field name="product_id" postion="after">
<field name="product_tmpl_id" invisible="1"/>
<field name="packaging_id" domain="[('product_tmpl_id','=',product_tmpl_id)]" groups="product.group_stock_packaging"/>
</field>
<field name="product_qty" position="attributes">
<attribute name="readonly">1</attribute>
</field>
<label for="product_qty" position="before">
<field name="product_purchase_qty"/>
<field name="product_purchase_uom_id" groups="product.group_uom"/>
<field name="product_uom" position="attributes">
<attribute name="attrs">{'readonly' : [('packaging_id', '!=', False)]}</attribute>
</field>
</label>
</data>
</field>
</record>
</data>
</openerp>