pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] delivery, product, stock: packaging naming

Browse Source 
"product packaging" -> "product packages"
"delivery packaging" -> "delivery packages"

Also adapt and simplify stock settings.
This commit is contained in:
Pierre Masereel
2017-05-04 18:06:08 +02:00
committed by Simon Lejeune
parent f62facde1d
commit 90da529eb7
9 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/views/delivery_view.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_config_settings" groups="stock.group_stock_manager" sequence="50"/>
<record id="action_delivery_packaging_view" model="ir.actions.act_window">
<field name="name">Packagings</field>
<field name="name">Delivery Packages</field>
<field name="res_model">product.packaging</field>
<field name="domain">[('product_id', '=', False)]</field>
<field name="view_ids" eval="[(5, 0, 0),
@@ -12,7 +12,7 @@
(0, 0, {'view_mode': 'form', 'view_id': ref('delivery.product_packaging_delivery_form')})]"/>
</record>
<menuitem id="menu_delivery_packagings" name="Delivery Packaging" parent="stock.menu_packages_config" action="action_delivery_packaging_view" groups="stock.group_tracking_lot"/>
<menuitem id="menu_delivery_packagings" name="Delivery Packages" parent="stock.menu_packages_config" action="action_delivery_packaging_view" groups="stock.group_tracking_lot"/>
<record id="view_delivery_carrier_tree" model="ir.ui.view">
<field name="name">delivery.carrier.tree</field>
addons/delivery/views/product_packaging_view.xml
+2 -2
View File
@@ -31,10 +31,10 @@
<field name="model">product.packaging</field>
<field name="inherit_id" eval="False"/>
<field name="arch" type="xml">
<tree string="Delivery Packagings">
<tree string="Delivery Packages">
<field name="sequence" widget="handle"/>
<field name="package_carrier_type"/>
<field name="name" string="Packaging"/>
<field name="name"/>
<field name="height"/>
<field name="width"/>
<field name="length"/>
addons/product/models/product.py
+2 -2
View File
@@ -138,7 +138,7 @@ class ProductProduct(models.Model):
'product.pricelist.item', 'Pricelist Items', compute='_get_pricelist_items')
packaging_ids = fields.One2many(
'product.packaging', 'product_id', 'Packaging',
'product.packaging', 'product_id', 'Product Packages',
help="Gives the different ways to package the same product.")
_sql_constraints = [
@@ -550,7 +550,7 @@ class ProductPackaging(models.Model):
_description = "Packaging"
_order = 'sequence'
name = fields.Char('Packaging Type', required=True)
name = fields.Char('Package Type', required=True)
sequence = fields.Integer('Sequence', default=1, help="The first in the sequence is the default one.")
product_id = fields.Many2one('product.product', string='Product')
qty = fields.Float('Quantity per Package', help="The total number of products you can have per pallet or box.")
addons/product/models/product_template.py
+1 -1
View File
@@ -101,7 +101,7 @@ class ProductTemplate(models.Model):
'res.company', 'Company',
default=lambda self: self.env['res.company']._company_default_get('product.template'), index=1)
packaging_ids = fields.One2many(
'product.packaging', string="Packaging", compute="_compute_packaging_ids", inverse="_set_packaging_ids",
'product.packaging', string="Product Packages", compute="_compute_packaging_ids", inverse="_set_packaging_ids",
help="Gives the different ways to package the same product.")
seller_ids = fields.One2many('product.supplierinfo', 'product_tmpl_id', 'Vendors')
addons/product/views/product_views.xml
+2 -2
View File
@@ -450,7 +450,7 @@
<field name="name">product.packaging.tree.view</field>
<field name="model">product.packaging</field>
<field name="arch" type="xml">
<tree string="Product Packagings">
<tree string="Product Packages">
<field name="sequence" widget="handle"/>
<field name="product_id"/>
<field name="name"/>
@@ -485,7 +485,7 @@
</record>
<record model="ir.actions.act_window" id="action_packaging_view">
<field name="name">Packagings</field>
<field name="name">Product Packages</field>
<field name="res_model">product.packaging</field>
<field name="domain">[('product_id', '!=', False)]</field>
<field name="view_ids" eval="[(5, 0, 0),
addons/sale_stock/models/sale_order.py
+1 -1
View File
@@ -86,7 +86,7 @@ class SaleOrder(models.Model):
class SaleOrderLine(models.Model):
_inherit = 'sale.order.line'
product_packaging = fields.Many2one('product.packaging', string='Packaging', default=False)
product_packaging = fields.Many2one('product.packaging', string='Package', default=False)
route_id = fields.Many2one('stock.location.route', string='Route', domain=[('sale_selectable', '=', True)], ondelete='restrict')
@api.depends('order_id.state')
addons/stock/models/stock_config_settings.py
+4 -6
View File
@@ -18,14 +18,12 @@ class StockConfigSettings(models.TransientModel):
help="Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs.")
module_product_expiry = fields.Boolean("Expiration Dates",
help="Track following dates on lots & serial numbers: best before, removal, end of life, alert. \n Such dates are set automatically at lot/serial number creation based on values set on the product (in days).")
group_stock_packaging = fields.Boolean('Packaging',
implied_group='product.group_stock_packaging',
help="Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form.")
group_stock_packaging = fields.Boolean('Product Packages',
implied_group='product.group_stock_packaging')
group_stock_production_lot = fields.Boolean("Lots & Serial Numbers",
implied_group='stock.group_production_lot')
group_stock_tracking_lot = fields.Boolean("Packages",
implied_group='stock.group_tracking_lot',
help="Put products in packages and get shipping labels per package unit thanks to shipping connectors.")
group_stock_tracking_lot = fields.Boolean("Delivery Packages",
implied_group='stock.group_tracking_lot')
group_stock_tracking_owner = fields.Boolean("Consignment",
implied_group='stock.group_tracking_owner')
group_stock_adv_location = fields.Boolean("Multi-Step Routes",
addons/stock/views/product_views.xml
+1 -1
View File
@@ -418,7 +418,7 @@
parent="stock.menu_stock_inventory_control" sequence="1"/>
<menuitem id="product_product_menu" name="Product Variants" action="product.product_normal_action"
parent="menu_stock_inventory_control" sequence="2" groups="product.group_product_variant"/>
<menuitem id="menu_product_packagings" name="Product Packaging" parent="stock.menu_packages_config" action="product.action_packaging_view" groups="product.group_stock_packaging"/>
<menuitem id="menu_product_packagings" name="Product Packages" parent="stock.menu_packages_config" action="product.action_packaging_view" groups="product.group_stock_packaging"/>
</data>
</odoo>
addons/stock/views/stock_config_settings_views.xml
+9 -9
View File
@@ -30,19 +30,14 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Put products in packages and get shipping labels per package unit thanks to shipping connectors.">
<div class="col-xs-12 col-md-6 o_setting_box" title="Put your products in packs (e.g. parcels, boxes) and track them">
<div class="o_setting_left_pane">
<field name="group_stock_tracking_lot"/>
</div>
<div class="o_setting_right_pane">
<label for="group_stock_tracking_lot"/>
<div class="text-muted">
Track product packages (e.g.pallets, boxes)
</div>
<div class="content-group">
<div class="mt16" attrs="{'invisible': [('group_stock_tracking_lot', '=', False)]}">
<button name="%(product.action_packaging_view)d" icon="fa-arrow-right" type="action" string="Package Types" class="btn-link"/>
</div>
Put your products in packs (e.g. parcels, boxes) and track them
</div>
</div>
</div>
@@ -170,14 +165,19 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form.">
<div class="col-xs-12 col-md-6 o_setting_box" title="Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)">
<div class="o_setting_left_pane">
<field name="group_stock_packaging"/>
</div>
<div class="o_setting_right_pane">
<label for="group_stock_packaging"/>
<div class="text-muted">
Manage product packaging
Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)
</div>
<div class="content-group">
<div class="mt16" attrs="{'invisible': [('group_stock_packaging', '=', False)]}">
<button name="%(product.action_packaging_view)d" icon="fa-arrow-right" type="action" string="Product Packages" class="btn-link"/>
</div>
</div>
</div>
</div>