odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged jco's feature branch clearing the packages and logistic units concepts 

bzr revid: qdp-launchpad@openerp.com-20140404131637-a23gqw42132q6ig5
This commit is contained in:
Quentin (OpenERP) 2014-04-04 15:16:37 +02:00
parent 10f073edf1 ac03a0df6c
commit 4254056188
5 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/product/product.py
View File

@ -214,10 +214,14 @@ class product_uom(osv.osv):
class product_ul(osv.osv): class product_ul(osv.osv):
_name = "product.ul" _name = "product.ul"
_description = "Shipping Unit" _description = "Logistic Unit"
_columns = { _columns = {
'name' : fields.char('Name', select=True, required=True, translate=True), 'name' : fields.char('Name', select=True, required=True, translate=True),
'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True), 'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
'height': fields.float('Height', help='The height of the package'),
'width': fields.float('Width', help='The width of the package'),
'length': fields.float('Length', help='The length of the package'),
'weight': fields.float('Empty Package Weight'),
} }
@ -724,7 +728,7 @@ class product_product(osv.osv):
'is_only_child': fields.function( 'is_only_child': fields.function(
_is_only_child, type='boolean', string='Sole child of the parent template'), _is_only_child, type='boolean', string='Sole child of the parent template'),
'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."), 'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
'packaging': fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."), 'packaging': fields.one2many('product.packaging', 'product_id', 'Packaging', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price'), help="Price Extra: Extra price for the variant on sale price. eg. 200 price extra, 1000 + 200 = 1200."), 'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price'), help="Price Extra: Extra price for the variant on sale price. eg. 200 price extra, 1000 + 200 = 1200."),
'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price'), help="Price Margin: Margin in percentage amount on sale price for the variant. eg. 10 price margin, 1000 * 1.1 = 1100."), 'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price'), help="Price Margin: Margin in percentage amount on sale price for the variant. eg. 10 price margin, 1000 * 1.1 = 1100."),
'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'), 'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
@ -937,8 +941,9 @@ class product_packaging(osv.osv):
'name' : fields.text('Description'), 'name' : fields.text('Description'),
'qty' : fields.float('Quantity by Package', 'qty' : fields.float('Quantity by Package',
help="The total number of products you can put by pallet or box."), help="The total number of products you can put by pallet or box."),
'ul' : fields.many2one('product.ul', 'Type of Package', required=True), 'ul' : fields.many2one('product.ul', 'Package Logistic Unit', required=True),
'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'), 'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'),
'ul_container': fields.many2one('product.ul', 'Pallet Logistic Unit'),
'rows' : fields.integer('Number of Layers', required=True, 'rows' : fields.integer('Number of Layers', required=True,
help='The number of layers on a pallet or box'), help='The number of layers on a pallet or box'),
'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True), 'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
@ -946,13 +951,8 @@ class product_packaging(osv.osv):
'code' : fields.char('Code', help="The code of the transport unit."), 'code' : fields.char('Code', help="The code of the transport unit."),
'weight': fields.float('Total Package Weight', 'weight': fields.float('Total Package Weight',
help='The weight of a full package, pallet or box.'), help='The weight of a full package, pallet or box.'),
'weight_ul': fields.float('Empty Package Weight'),
'height': fields.float('Height', help='The height of the package'),
'width': fields.float('Width', help='The width of the package'),
'length': fields.float('Length', help='The length of the package'),
} }
def _check_ean_key(self, cr, uid, ids, context=None): def _check_ean_key(self, cr, uid, ids, context=None):
for pack in self.browse(cr, uid, ids, context=context): for pack in self.browse(cr, uid, ids, context=context):
res = check_ean(pack.ean) res = check_ean(pack.ean)

37
addons/product/product_view.xml
View File

@ -171,8 +171,8 @@
attrs="{'readonly': [('is_only_child', '=', False)]}"/> attrs="{'readonly': [('is_only_child', '=', False)]}"/>
</group> </group>
</group> </group>
<field name="packaging" groups="product.group_stock_packaging" <separator string="Packages" groups="product.group_stock_packaging"/>
attrs="{'readonly': [('is_only_child', '=', False)]}"> <field name="packaging" groups="product.group_stock_packaging" attrs="{'readonly': [('is_only_child', '=', False)]}">
<form string="Packaging" version="7.0"> <form string="Packaging" version="7.0">
<group col="4"> <group col="4">
<field name="ean"/> <field name="ean"/>
@ -180,15 +180,11 @@
<newline/> <newline/>
<field name="qty"/> <field name="qty"/>
<field name="ul"/> <field name="ul"/>
<field name="weight_ul"/>
<separator colspan="4" string="Palletization"/> <separator colspan="4" string="Palletization"/>
<field name="ul_qty"/> <field name="ul_qty"/>
<field name="ul_container" domain="[('type', '=', 'pallet')]" context="{'default_type': 'pallet'}"/>
<field name="rows"/> <field name="rows"/>
<field name="weight"/> <field name="weight"/>
<separator colspan="4" string="Pallet Dimension"/>
<field name="height"/>
<field name="width"/>
<field name="length"/>
</group> </group>
<separator colspan="4" string="Description"/> <separator colspan="4" string="Description"/>
<field name="name"/> <field name="name"/>
@ -579,11 +575,17 @@
<field name="name">product.ul.form.view</field> <field name="name">product.ul.form.view</field>
<field name="model">product.ul</field> <field name="model">product.ul</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Packaging" version="7.0"> <form string="Logistic Units" version="7.0">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>
</group> </group>
<group>
<field name="height"/>
<field name="width"/>
<field name="length"/>
<field name="weight"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -591,25 +593,25 @@
<field name="name">product.ul.tree</field> <field name="name">product.ul.tree</field>
<field name="model">product.ul</field> <field name="model">product.ul</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Packaging"> <tree string="Logistic Units">
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>
</tree> </tree>
</field> </field>
</record> </record>
<record id="product_ul_form_action" model="ir.actions.act_window"> <record id="product_ul_form_action" model="ir.actions.act_window">
<field name="name">Packaging</field> <field name="name">Logistic Units</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">product.ul</field> <field name="res_model">product.ul</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">
Click to add a new packaging type. Click to add a new Logistic Unit
</p><p> </p><p>
The packaging type define the dimensions as well as the number The logistic unit defines the container used for the package.
of products per package. This will ensure salesperson sell the It has a type (e.g. pallet, box, ...) and you can specify its
right number of products according to the package selected. size.
</p> </p>
</field> </field>
</record> </record>
@ -625,6 +627,7 @@
<field name="ean"/> <field name="ean"/>
<field name="qty"/> <field name="qty"/>
<field name="ul"/> <field name="ul"/>
<field name="ul_container"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -642,15 +645,11 @@
<newline/> <newline/>
<field name="qty"/> <field name="qty"/>
<field name="ul"/> <field name="ul"/>
<field name="weight_ul"/>
<separator colspan="4" string="Palletization"/> <separator colspan="4" string="Palletization"/>
<field name="ul_qty"/> <field name="ul_qty"/>
<field name="rows"/> <field name="rows"/>
<field name="ul_container"/>
<field name="weight"/> <field name="weight"/>
<separator colspan="4" string="Pallet Dimension"/>
<field name="height"/>
<field name="width"/>
<field name="length"/>
<separator colspan="4" string="Other Info"/> <separator colspan="4" string="Other Info"/>
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
</group> </group>

5
addons/product_expiry/product_expiry_demo.xml
View File

@ -19,6 +19,7 @@
<field name="categ_id" search="[]" model="product.category"/> <field name="categ_id" search="[]" model="product.category"/>
<field name="image" type="base64" file="product_expiry/static/img/product_product_jambon-image.jpg"/> <field name="image" type="base64" file="product_expiry/static/img/product_product_jambon-image.jpg"/>
</record> </record>
<record id="product_package_jambon" model="product.packaging"> <record id="product_package_jambon" model="product.packaging">
<field name="name">box of 10</field> <field name="name">box of 10</field>
<field name="qty">12</field> <field name="qty">12</field>
@ -28,7 +29,6 @@
<field name="product_id" ref="product_product_jambon" /> <field name="product_id" ref="product_product_jambon" />
<field name="ean"></field> <field name="ean"></field>
<field name="weight">10</field> <field name="weight">10</field>
<field name="weight_ul">240</field>
</record> </record>
<record id="product_product_from" model="product.product"> <record id="product_product_from" model="product.product">
@ -57,7 +57,6 @@
<field name="product_id" ref="product_product_from" /> <field name="product_id" ref="product_product_from" />
<field name="ean"></field> <field name="ean"></field>
<field name="weight">10</field> <field name="weight">10</field>
<field name="weight_ul">240</field>
</record> </record>
<record id="product_product_pain" model="product.product"> <record id="product_product_pain" model="product.product">
@ -86,7 +85,6 @@
<field name="product_id" ref="product_product_pain" /> <field name="product_id" ref="product_product_pain" />
<field name="ean"></field> <field name="ean"></field>
<field name="weight">10</field> <field name="weight">10</field>
<field name="weight_ul">240</field>
</record> </record>
<record id="product_product_lait" model="product.product"> <record id="product_product_lait" model="product.product">
@ -115,7 +113,6 @@
<field name="product_id" ref="product_product_lait" /> <field name="product_id" ref="product_product_lait" />
<field name="ean"></field> <field name="ean"></field>
<field name="weight">10</field> <field name="weight">10</field>
<field name="weight_ul">240</field>
</record> </record>
</data> </data>
</openerp> </openerp>

3
addons/stock/stock.py
View File

@ -3506,7 +3506,8 @@ class stock_package(osv.osv):
'complete_name': fields.function(_complete_name, type='char', string="Package Name",), 'complete_name': fields.function(_complete_name, type='char', string="Package Name",),
'parent_left': fields.integer('Left Parent', select=1), 'parent_left': fields.integer('Left Parent', select=1),
'parent_right': fields.integer('Right Parent', select=1), 'parent_right': fields.integer('Right Parent', select=1),
'packaging_id': fields.many2one('product.packaging', 'Type of Packaging'), 'packaging_id': fields.many2one('product.packaging', 'Packaging', help="This field should be completed only if everything inside the package share the same product, otherwise it doesn't really makes sense."),
'ul_id': fields.many2one('product.ul', 'Logistic Unit'),
'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package", 'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package",
store={ store={
'stock.quant': (_get_packages, ['location_id'], 10), 'stock.quant': (_get_packages, ['location_id'], 10),

10
addons/stock/stock_view.xml
View File

@ -1716,8 +1716,8 @@
<filter string='Owner' context="{'group_by' : 'owner_id'}" groups="stock.group_tracking_owner"/> <filter string='Owner' context="{'group_by' : 'owner_id'}" groups="stock.group_tracking_owner"/>
<filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_production_lot"/> <filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_production_lot"/>
<filter name="locationgroup" string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/> <filter name="locationgroup" string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
<filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/> <filter string='Package' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/>
<filter string='Packaging Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/> <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/>
<filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/> <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
</group> </group>
</search> </search>
@ -1933,6 +1933,7 @@
</div> </div>
<group> <group>
<group> <group>
<field name="ul_id"/>
<field name="packaging_id"/> <field name="packaging_id"/>
<field name='company_id' groups="base.group_multi_company"/> <field name='company_id' groups="base.group_multi_company"/>
<field name='owner_id' groups="stock.group_tracking_owner"/> <field name='owner_id' groups="stock.group_tracking_owner"/>
@ -1941,7 +1942,6 @@
<field name="location_id"/> <field name="location_id"/>
<field name="parent_id"/> <field name="parent_id"/>
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Content"> <page string="Content">
@ -1962,6 +1962,7 @@
<field name="children_ids"> <field name="children_ids">
<tree string="Contained Packages"> <tree string="Contained Packages">
<field name="complete_name"/> <field name="complete_name"/>
<field name="ul_id"/>
<field name="packaging_id"/> <field name="packaging_id"/>
<field name="location_id"/> <field name="location_id"/>
</tree> </tree>
@ -1969,7 +1970,6 @@
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
</form> </form>
</field> </field>
</record> </record>
@ -1982,6 +1982,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Package"> <tree string="Package">
<field name="complete_name"/> <field name="complete_name"/>
<field name="ul_id"/>
<field name="packaging_id"/> <field name="packaging_id"/>
<field name="location_id"/> <field name="location_id"/>
<field name="company_id"/> <field name="company_id"/>
@ -1996,6 +1997,7 @@
<search string="Package"> <search string="Package">
<field name="name" string="Package Name"/> <field name="name" string="Package Name"/>
<field name="location_id"/> <field name="location_id"/>
<field name="ul_id"/>
<field name="packaging_id"/> <field name="packaging_id"/>
<group expand='0' string='Group by...'> <group expand='0' string='Group by...'>
<filter string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/> <filter string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>